diff -r -u Ice-1.0.1.orig/demo/IcePack/hello/Server.cpp Ice-1.0.1/demo/IcePack/hello/Server.cpp --- Ice-1.0.1.orig/demo/IcePack/hello/Server.cpp Mon Apr 7 10:04:42 2003 +++ Ice-1.0.1/demo/IcePack/hello/Server.cpp Mon Apr 7 10:04:55 2003 @@ -26,7 +26,7 @@ }; int -::Server::run(int argc, char* argv[]) +Server::run(int argc, char* argv[]) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello"); diff -r -u Ice-1.0.1.orig/src/Ice/Proxy.cpp Ice-1.0.1/src/Ice/Proxy.cpp --- Ice-1.0.1.orig/src/Ice/Proxy.cpp Mon Apr 7 09:08:00 2003 +++ Ice-1.0.1/src/Ice/Proxy.cpp Mon Apr 7 09:08:09 2003 @@ -1197,7 +1197,7 @@ Direct __direct(__current); return __direct.facetServant()->ice_id(__current); } - return false; // To keep the Visual C++ compiler happy. + //return false; // To keep the Visual C++ compiler happy. } FacetPath diff -r -u Ice-1.0.1.orig/src/IceSSL/Context.cpp Ice-1.0.1/src/IceSSL/Context.cpp --- Ice-1.0.1.orig/src/IceSSL/Context.cpp Mon Apr 7 09:10:20 2003 +++ Ice-1.0.1/src/IceSSL/Context.cpp Mon Apr 7 09:10:35 2003 @@ -31,8 +31,8 @@ using namespace Ice; using namespace IceInternal; -void ::IceInternal::incRef(::IceSSL::Context* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::Context* p) { p->__decRef(); } +void IceInternal::incRef(::IceSSL::Context* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::Context* p) { p->__decRef(); } IceSSL::Context::~Context() { diff -r -u Ice-1.0.1.orig/src/IceSSL/DHParams.cpp Ice-1.0.1/src/IceSSL/DHParams.cpp --- Ice-1.0.1.orig/src/IceSSL/DHParams.cpp Mon Apr 7 09:13:09 2003 +++ Ice-1.0.1/src/IceSSL/DHParams.cpp Mon Apr 7 09:13:21 2003 @@ -14,8 +14,8 @@ #include -void ::IceInternal::incRef(::IceSSL::DHParams* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::DHParams* p) { p->__decRef(); } +void IceInternal::incRef(::IceSSL::DHParams* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::DHParams* p) { p->__decRef(); } IceSSL::DHParams::DHParams(DH* dhParams) : _dhParams(dhParams) diff -r -u Ice-1.0.1.orig/src/IceSSL/RSAKeyPair.cpp Ice-1.0.1/src/IceSSL/RSAKeyPair.cpp --- Ice-1.0.1.orig/src/IceSSL/RSAKeyPair.cpp Mon Apr 7 09:12:39 2003 +++ Ice-1.0.1/src/IceSSL/RSAKeyPair.cpp Mon Apr 7 09:12:52 2003 @@ -19,8 +19,8 @@ #include #include -void ::IceInternal::incRef(::IceSSL::RSAKeyPair* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::RSAKeyPair* p) { p->__decRef(); } +void IceInternal::incRef(::IceSSL::RSAKeyPair* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::RSAKeyPair* p) { p->__decRef(); } using std::back_inserter; using std::string; diff -r -u Ice-1.0.1.orig/src/IceSSL/RSAPrivateKey.cpp Ice-1.0.1/src/IceSSL/RSAPrivateKey.cpp --- Ice-1.0.1.orig/src/IceSSL/RSAPrivateKey.cpp Mon Apr 7 09:11:23 2003 +++ Ice-1.0.1/src/IceSSL/RSAPrivateKey.cpp Mon Apr 7 09:11:36 2003 @@ -20,8 +20,8 @@ #include #include -void ::IceInternal::incRef(::IceSSL::RSAPrivateKey* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::RSAPrivateKey* p) { p->__decRef(); } +void IceInternal::incRef(::IceSSL::RSAPrivateKey* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::RSAPrivateKey* p) { p->__decRef(); } using std::back_inserter; using std::string; diff -r -u Ice-1.0.1.orig/src/IceSSL/RSAPublicKey.cpp Ice-1.0.1/src/IceSSL/RSAPublicKey.cpp --- Ice-1.0.1.orig/src/IceSSL/RSAPublicKey.cpp Mon Apr 7 09:11:53 2003 +++ Ice-1.0.1/src/IceSSL/RSAPublicKey.cpp Mon Apr 7 09:12:06 2003 @@ -20,8 +20,8 @@ #include #include -void ::IceInternal::incRef(::IceSSL::RSAPublicKey* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::RSAPublicKey* p) { p->__decRef(); } +void IceInternal::incRef(::IceSSL::RSAPublicKey* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::RSAPublicKey* p) { p->__decRef(); } using std::back_inserter; using std::string; diff -r -u Ice-1.0.1.orig/src/IceStorm/TopicI.cpp Ice-1.0.1/src/IceStorm/TopicI.cpp --- Ice-1.0.1.orig/src/IceStorm/TopicI.cpp Mon Apr 7 09:23:35 2003 +++ Ice-1.0.1/src/IceStorm/TopicI.cpp Mon Apr 7 09:26:19 2003 @@ -34,61 +34,6 @@ typedef std::list SubscriberList; // -// The servant has a 1-1 association with a topic. It is used to -// receive events from Publishers. -// -class PublisherProxyI : public Ice::Blobject -{ -public: - - PublisherProxyI(const IceStorm::TopicSubscribersPtr& s) : - _subscribers(s) - { - } - - ~PublisherProxyI() - { - } - - virtual bool ice_invoke(const vector< Ice::Byte>&, vector< Ice::Byte>&, const Ice::Current&); - -private: - - // - // Set of associated subscribers - // - IceStorm::TopicSubscribersPtr _subscribers; -}; - -// -// The servant has a 1-1 association with a topic. It is used to -// receive events from linked Topics.. -// -class TopicLinkI : public TopicLink -{ -public: - - TopicLinkI(const IceStorm::TopicSubscribersPtr& s) : - _subscribers(s) - { - } - - ~TopicLinkI() - { - } - - virtual void forward(const string&, ::Ice::OperationMode, const ByteSeq&, const ContextData&, const Ice::Current&); - -private: - - // - // Set of associated subscribers - // - IceStorm::TopicSubscribersPtr _subscribers; -}; - - -// // Holder for the set of subscribers. // class TopicSubscribers : public IceUtil::Shared @@ -275,6 +220,60 @@ SubscriberList _error; }; +// +// The servant has a 1-1 association with a topic. It is used to +// receive events from Publishers. +// +class PublisherProxyI : public Ice::Blobject +{ +public: + + PublisherProxyI(const IceStorm::TopicSubscribersPtr& s) : + _subscribers(s) + { + } + + ~PublisherProxyI() + { + } + + virtual bool ice_invoke(const vector< Ice::Byte>&, vector< Ice::Byte>&, const Ice::Current&); + +private: + + // + // Set of associated subscribers + // + IceStorm::TopicSubscribersPtr _subscribers; +}; + +// +// The servant has a 1-1 association with a topic. It is used to +// receive events from linked Topics.. +// +class TopicLinkI : public TopicLink +{ +public: + + TopicLinkI(const IceStorm::TopicSubscribersPtr& s) : + _subscribers(s) + { + } + + ~TopicLinkI() + { + } + + virtual void forward(const string&, ::Ice::OperationMode, const ByteSeq&, const ContextData&, const Ice::Current&); + +private: + + // + // Set of associated subscribers + // + IceStorm::TopicSubscribersPtr _subscribers; +}; + } // End namespace IceStorm // diff -r -u Ice-1.0.1.orig/src/slice2cpp/Gen.cpp Ice-1.0.1/src/slice2cpp/Gen.cpp --- Ice-1.0.1.orig/src/slice2cpp/Gen.cpp Mon Feb 24 07:42:45 2003 +++ Ice-1.0.1/src/slice2cpp/Gen.cpp Mon Apr 7 09:01:43 2003 @@ -2694,7 +2694,7 @@ << scoped << "Prx& d)"; C << sb; C << nl << "d = 0;"; - C << nl << "if(b)"; + C << nl << "if(b.operator bool())"; C << sb; C << nl << "d = dynamic_cast< ::IceProxy" << scoped << "*>(b.get());"; C << nl << "if(!d && b->ice_isA(\"" << p->scoped() << "\"))"; @@ -2710,7 +2710,7 @@ << scoped << "Prx& d)"; C << sb; C << nl << "d = 0;"; - C << nl << "if(b)"; + C << nl << "if(b.operator bool())"; C << sb; C << nl << "::Ice::ObjectPrx bb = b->ice_appendFacet(f);"; C << nl << "try"; @@ -2732,7 +2732,7 @@ << scoped << "Prx& d)"; C << sb; C << nl << "d = 0;"; - C << nl << "if(b)"; + C << nl << "if(b.operator bool())"; C << sb; C << nl << "d = dynamic_cast< ::IceProxy" << scoped << "*>(b.get());"; C << nl << "if(!d)"; @@ -2748,7 +2748,7 @@ << scoped << "Prx& d)"; C << sb; C << nl << "d = 0;"; - C << nl << "if(b)"; + C << nl << "if(b.operator bool())"; C << sb; C << nl << "::Ice::ObjectPrx bb = b->ice_appendFacet(f);"; C << nl << "d = new ::IceProxy" << scoped << ";"; @@ -3273,7 +3273,7 @@ string classNameAMI = "AMI_" + fixKwd(cl->name()); string classNameAMD = "AMD_" + fixKwd(cl->name()); - string classScope = fixKwd(cl->scope()); + string classScope = string(fixKwd(cl->scope())).substr(2, string::npos); string classScopedAMI = classScope + classNameAMI; string classScopedAMD = classScope + classNameAMD; @@ -3551,7 +3551,7 @@ H << nl << "virtual void ice_exception();"; H << eb << ';'; - C << sp << nl << "::IceAsync" << classScopedAMD << '_' << name << "::" << classNameAMD << '_' << name + C << sp << nl << "IceAsync" << classScopedAMD << '_' << name << "::" << classNameAMD << '_' << name << "(::IceInternal::Incoming& in) :"; C.inc(); C << nl << "IncomingAsync(in)"; @@ -3559,7 +3559,7 @@ C << sb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name << "::ice_response(" + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_response(" << paramsDecl << ')'; C << sb; C << nl << "if(!_finished)"; @@ -3581,7 +3581,7 @@ C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception(const ::Ice::Exception& ex)"; C << sb; C << nl << "if(!_finished)"; @@ -3613,7 +3613,7 @@ C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception(const ::std::exception& ex)"; C << sb; C << nl << "if(!_finished)"; @@ -3622,7 +3622,7 @@ C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception()"; C << sb; C << nl << "if(!_finished)"; diff -r -u Ice-1.0.1.orig/test/IcePack/deployer/Server.cpp Ice-1.0.1/test/IcePack/deployer/Server.cpp --- Ice-1.0.1.orig/test/IcePack/deployer/Server.cpp Mon Apr 7 09:45:09 2003 +++ Ice-1.0.1/test/IcePack/deployer/Server.cpp Mon Apr 7 09:45:18 2003 @@ -27,7 +27,7 @@ }; int -::Server::run(int argc, char* argv[]) +Server::run(int argc, char* argv[]) { Ice::PropertiesPtr properties = communicator()->getProperties(); string name = properties->getProperty("Ice.ProgramName"); diff -r -u Ice-1.0.1.orig/test/IcePack/simple/Server.cpp Ice-1.0.1/test/IcePack/simple/Server.cpp --- Ice-1.0.1.orig/test/IcePack/simple/Server.cpp Mon Apr 7 09:44:11 2003 +++ Ice-1.0.1/test/IcePack/simple/Server.cpp Mon Apr 7 09:44:20 2003 @@ -26,7 +26,7 @@ }; int -::Server::run(int argc, char* argv[]) +Server::run(int argc, char* argv[]) { Ice::StringSeq args = Ice::argsToStringSeq(argc, argv); args = communicator()->getProperties()->parseCommandLineOptions("TestAdapter", args);