diff options
| author | ZeroC Staff <git@zeroc.com> | 2007-11-21 22:33:27 -0500 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2007-11-21 22:33:27 -0500 |
| commit | f419abacd263d1f7e648e5f49c72f999424ff03f (patch) | |
| tree | 0c1da545305db95281266f23f0b39c3f3584c6cd /cpp/src | |
| parent | Refactored server-properties access/retrieval from IceGrid admin client (diff) | |
| download | ice-f419abacd263d1f7e648e5f49c72f999424ff03f.tar.bz2 ice-f419abacd263d1f7e648e5f49c72f999424ff03f.tar.xz ice-f419abacd263d1f7e648e5f49c72f999424ff03f.zip | |
Fixed VC6 build failures
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/TransactionalEvictorContext.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 4 | ||||
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/cpp/src/Freeze/TransactionalEvictorContext.cpp b/cpp/src/Freeze/TransactionalEvictorContext.cpp index 99fd3ecdafa..9d88aeef073 100644 --- a/cpp/src/Freeze/TransactionalEvictorContext.cpp +++ b/cpp/src/Freeze/TransactionalEvictorContext.cpp @@ -54,7 +54,7 @@ Freeze::TransactionalEvictorDeadlockException::ice_throw() const void Freeze::TransactionalEvictorDeadlockException::ice_print(ostream& out) const { - Ice::Exception::ice_print(out); + Exception::ice_print(out); out << ":\ntransactional evictor deadlock exception"; } diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 64bd7cb81b7..92913149d43 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -376,7 +376,9 @@ AdminI::getServerProperties(const string& id, const Current&) const Ice::ObjectPrx AdminI::getServerAdmin(const string& id, const Current& current) const { - Ice::Identity adminId = { id, _registry->getServerAdminCategory() }; + Ice::Identity adminId; + adminId.name = id; + adminId.category =_registry->getServerAdminCategory(); return current.adapter->createProxy(adminId); } diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 90a1428c078..9a8c547138a 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -417,7 +417,9 @@ ServerEntry::getAdminProxy() // // The category must match the server admin category used by nodes // - Ice::Identity adminId = {_id, _cache.getInstanceName() + "-NodeRouter" }; + Ice::Identity adminId; + adminId.name = _id; + adminId.category = _cache.getInstanceName() + "-NodeRouter"; // TODO: what's this upToDate parameter about?? diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index d705191ed2b..dc23423563c 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -4180,9 +4180,9 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) _out << sb; _out << nl << "direct__.destroy();"; _out << eb; - for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i) + for(ExceptionList::const_iterator j = throws.begin(); j != throws.end(); ++j) { - _out << nl << "catch(" << fixId((*i)->scoped()) << " ex__)"; + _out << nl << "catch(" << fixId((*j)->scoped()) << " ex__)"; _out << sb; _out << nl << "throw ex__;"; _out << eb; |