diff options
| -rw-r--r-- | cpp/demo/Freeze/bench/Client.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/IcePack/AdapterRegistryI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePack/NodeRegistryI.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServerRegistryI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TopicManagerI.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 156a0b52bd5..13d1dfbd460 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -198,7 +198,7 @@ TestApp::IntIntMapTest() _watch.start(); for(i = 0; i < _repetitions; ++i) { - IntIntMap::const_iterator p = m.find(i); + IntIntMap::iterator p = m.find(i); test(p != m.end()); test(p->second == i); } @@ -234,7 +234,7 @@ TestApp::generatedRead(IntIntMap& m, int reads , const GeneratorPtr& gen) for(int i = 0; i < reads; ++i) { int key = gen->next(); - IntIntMap::const_iterator p = m.find(key); + IntIntMap::iterator p = m.find(key); test(p != m.end()); test(p->second == key); } @@ -341,7 +341,7 @@ TestApp::Struct1Struct2MapTest() for(i = 0; i < _repetitions; ++i) { s1.l = i; - Struct1Struct2Map::const_iterator p = m.find(s1); + Struct1Struct2Map::iterator p = m.find(s1); test(p != m.end()); ostringstream os; os << i; @@ -409,7 +409,7 @@ TestApp::Struct1Class1MapTest() for(i = 0; i < _repetitions; ++i) { s1.l = i; - Struct1Class1Map::const_iterator p = m.find(s1); + Struct1Class1Map::iterator p = m.find(s1); test(p != m.end()); ostringstream os; os << i; @@ -490,7 +490,7 @@ TestApp::Struct1ObjectMapTest() for(i = 0; i < _repetitions; ++i) { s1.l = i; - Struct1ObjectMap::const_iterator p = m.find(s1); + Struct1ObjectMap::iterator p = m.find(s1); test(p != m.end()); Ice::ObjectPtr o = p->second; Class1Ptr nc1; diff --git a/cpp/src/IcePack/AdapterRegistryI.cpp b/cpp/src/IcePack/AdapterRegistryI.cpp index 74bfd47e1bb..9cfcd0e5d69 100644 --- a/cpp/src/IcePack/AdapterRegistryI.cpp +++ b/cpp/src/IcePack/AdapterRegistryI.cpp @@ -120,7 +120,7 @@ IcePack::AdapterRegistryI::getAll(const Ice::Current&) const Ice::StringSeq ids; ids.reserve(dict.size()); - for(StringObjectProxyDict::const_iterator p = dict.begin(); p != dict.end(); ++p) + for(StringObjectProxyDict::iterator p = dict.begin(); p != dict.end(); ++p) { ids.push_back(p->first); } diff --git a/cpp/src/IcePack/NodeRegistryI.cpp b/cpp/src/IcePack/NodeRegistryI.cpp index b84d6bdcaa5..521b059989f 100644 --- a/cpp/src/IcePack/NodeRegistryI.cpp +++ b/cpp/src/IcePack/NodeRegistryI.cpp @@ -30,7 +30,7 @@ IcePack::NodeRegistryI::NodeRegistryI(const Ice::CommunicatorPtr& communicator, _communicator(communicator), _dbName(dbName) { - for(StringObjectProxyDict::const_iterator p = _dictCache.begin(); p != _dictCache.end(); ++p) + for(StringObjectProxyDict::iterator p = _dictCache.begin(); p != _dictCache.end(); ++p) { NodePrx node = NodePrx::uncheckedCast(p->second); try @@ -164,7 +164,7 @@ IcePack::NodeRegistryI::findByName(const string& name, const Ice::Current&) Freeze::ConnectionPtr connection = Freeze::createConnection(_communicator, _envName); StringObjectProxyDict dict(connection, _dbName); - StringObjectProxyDict::const_iterator p = dict.find(name); + StringObjectProxyDict::iterator p = dict.find(name); if(p != dict.end()) { try @@ -191,7 +191,7 @@ IcePack::NodeRegistryI::getAll(const Ice::Current&) const Ice::StringSeq names; names.reserve(dict.size()); - for(StringObjectProxyDict::const_iterator p = dict.begin(); p != dict.end(); ++p) + for(StringObjectProxyDict::iterator p = dict.begin(); p != dict.end(); ++p) { names.push_back(p->first); } diff --git a/cpp/src/IcePack/ServerRegistryI.cpp b/cpp/src/IcePack/ServerRegistryI.cpp index a5f0bc70958..e54cfb3d166 100644 --- a/cpp/src/IcePack/ServerRegistryI.cpp +++ b/cpp/src/IcePack/ServerRegistryI.cpp @@ -121,7 +121,7 @@ IcePack::ServerRegistryI::getAll(const Ice::Current&) const Ice::StringSeq names; names.reserve(dict.size()); - for(StringObjectProxyDict::const_iterator p = dict.begin(); p != dict.end(); ++p) + for(StringObjectProxyDict::iterator p = dict.begin(); p != dict.end(); ++p) { names.push_back(p->first); } diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 65aaa117852..3deac45701e 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -38,7 +38,7 @@ TopicManagerI::TopicManagerI(const Ice::CommunicatorPtr& communicator, const Ice // // Recreate each of the topics in the persistent map // - for(PersistentTopicMap::const_iterator p = _topics.begin(); p != _topics.end(); ++p) + for(PersistentTopicMap::iterator p = _topics.begin(); p != _topics.end(); ++p) { installTopic(p->first, p->second, false); } |