diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-21 15:21:00 +0100 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-03-21 15:21:00 +0100 |
| commit | 0321df7292018d1e7408ef9ad193c8fc7bf4765d (patch) | |
| tree | 6152d94c2b614bb823f75d864c2a729e8221248a /test/files/jvm/serialization.check | |
| parent | 13a325b126ac6f2f5d2e7d1fc2c008d012367430 (diff) | |
| parent | f6c050e8cfa5bd1ee4bbb3434086d2ae2d35e5f7 (diff) | |
| download | scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.tar.gz scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.tar.bz2 scala-0321df7292018d1e7408ef9ad193c8fc7bf4765d.zip | |
Merge branch 'master' into feature/pc-execution-contexts
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 81b68f0f5d..0b8055a6b9 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 = Ctrie(1 -> one, 2 -> two, 3 -> three) -y = Ctrie(1 -> one, 2 -> two, 3 -> three) +x = ConcurrentTrieMap(1 -> one, 2 -> two, 3 -> three) +y = ConcurrentTrieMap(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 = ParCtrie(1 -> 2, 2 -> 4) -y = ParCtrie(1 -> 2, 2 -> 4) +x = ParConcurrentTrieMap(1 -> 2, 2 -> 4) +y = ParConcurrentTrieMap(1 -> 2, 2 -> 4) x equals y: true, y equals x: true x = ParHashSet(1, 2, 3) |