diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-27 20:57:45 +0200 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-27 21:00:28 +0200 |
| commit | 37b6b48b5fabb804ec02d762df7d83577ccad2ac (patch) | |
| tree | a4267edcf349b6bdb7a1628a7b3d5225798303bc /test/files/jvm/serialization.check | |
| parent | 0321df7292018d1e7408ef9ad193c8fc7bf4765d (diff) | |
| download | scala-37b6b48b5fabb804ec02d762df7d83577ccad2ac.tar.gz scala-37b6b48b5fabb804ec02d762df7d83577ccad2ac.tar.bz2 scala-37b6b48b5fabb804ec02d762df7d83577ccad2ac.zip | |
Rename ConcurrentTrieMap to concurrent.TrieMap.
Introduced the collection.concurrent package and introduced the
concurrent.Map trait there. Deprecated the mutable.ConcurrentMap trait.
Pending work - introduce the appropriate changes to JavaConversions
and JavaConverters.
Diffstat (limited to 'test/files/jvm/serialization.check')
| -rw-r--r-- | test/files/jvm/serialization.check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 0b8055a6b9..fa51c6a879 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -192,8 +192,8 @@ x = TreeSet(1, 2, 3) y = TreeSet(1, 2, 3) x equals y: true, y equals x: true -x = ConcurrentTrieMap(1 -> one, 2 -> two, 3 -> three) -y = ConcurrentTrieMap(1 -> one, 2 -> two, 3 -> three) +x = TrieMap(1 -> one, 2 -> two, 3 -> three) +y = TrieMap(1 -> one, 2 -> two, 3 -> three) x equals y: true, y equals x: true x = xml:src="hello" @@ -287,8 +287,8 @@ x = ParHashMap(2 -> 4, 1 -> 2) y = ParHashMap(2 -> 4, 1 -> 2) x equals y: true, y equals x: true -x = ParConcurrentTrieMap(1 -> 2, 2 -> 4) -y = ParConcurrentTrieMap(1 -> 2, 2 -> 4) +x = ParTrieMap(1 -> 2, 2 -> 4) +y = ParTrieMap(1 -> 2, 2 -> 4) x equals y: true, y equals x: true x = ParHashSet(1, 2, 3) |