summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-06-09 21:21:25 +0000
committerBernard Normier <bernard@zeroc.com>2003-06-09 21:21:25 +0000
commit0db355e2c509efadd90d39c2cacca70ebcd26ecf (patch)
tree9254b23e3342c243c00f14321de642ab8cd4ee5d /cpp
parentChanged the behavior of Freeze::Map::insert and added Freeze::Map::put (diff)
downloadice-0db355e2c509efadd90d39c2cacca70ebcd26ecf.tar.bz2
ice-0db355e2c509efadd90d39c2cacca70ebcd26ecf.tar.xz
ice-0db355e2c509efadd90d39c2cacca70ebcd26ecf.zip
Fixed VC6 build failure
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Freeze/dbmap/Client.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index a9ef7998f0c..4cde77d629a 100644
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/Client.cpp
@@ -272,8 +272,12 @@ run(int argc, char* argv[], MAP& m)
//
typename MAP::value_type i3('a', 7);
-
- pair<typename MAP::iterator, bool> insertResult = m.insert(i3);
+
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+ pair<MAP::iterator, bool> insertResult = m.insert(i3);
+#else
+ pair<typename MAP::iterator, bool> insertResult = m.insert(i3);
+#endif
test(insertResult.first == m.find('a'));
test(insertResult.first->second == 0);
test(insertResult.second == false);