summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-09-27 17:40:37 +0000
committerBernard Normier <bernard@zeroc.com>2003-09-27 17:40:37 +0000
commit7a6d64e4a53a571f65e9dd07093a8d570d9fa3e7 (patch)
treeece319fbf155c43b4b53d3f5e10871fef3d65270 /cpp
parentchanging version to 1.2.0 (diff)
downloadice-7a6d64e4a53a571f65e9dd07093a8d570d9fa3e7.tar.bz2
ice-7a6d64e4a53a571f65e9dd07093a8d570d9fa3e7.tar.xz
ice-7a6d64e4a53a571f65e9dd07093a8d570d9fa3e7.zip
Minor compilation fix for VC6
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Freeze/ConnectionI.cpp8
-rw-r--r--cpp/src/Freeze/SharedDb.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Freeze/ConnectionI.cpp b/cpp/src/Freeze/ConnectionI.cpp
index 630c49fd3e6..7701e39ef24 100644
--- a/cpp/src/Freeze/ConnectionI.cpp
+++ b/cpp/src/Freeze/ConnectionI.cpp
@@ -116,15 +116,15 @@ Freeze::ConnectionI::closeAllIterators()
}
void
-Freeze::ConnectionI::registerMap(DBMapHelperI* map)
+Freeze::ConnectionI::registerMap(DBMapHelperI* m)
{
- _mapList.push_back(map);
+ _mapList.push_back(m);
}
void
-Freeze::ConnectionI::unregisterMap(DBMapHelperI* map)
+Freeze::ConnectionI::unregisterMap(DBMapHelperI* m)
{
- _mapList.remove(map);
+ _mapList.remove(m);
}
Freeze::ConnectionPtr
diff --git a/cpp/src/Freeze/SharedDb.h b/cpp/src/Freeze/SharedDb.h
index 52da8e4010c..641e8bb13e7 100644
--- a/cpp/src/Freeze/SharedDb.h
+++ b/cpp/src/Freeze/SharedDb.h
@@ -30,7 +30,7 @@ class SharedDb : public ::Db
{
public:
- using ::Db::get;
+ using Db::get;
static SharedDbPtr get(const ConnectionIPtr&, const std::string&, bool);