diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/src/Ice/LocatorInfo.h | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/src/Ice/LocatorInfo.h')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index 4abbfac03ff..09f114663cc 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -109,14 +109,14 @@ public: void addCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&); std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&); + + void response(const Ice::ObjectPrx&); + void exception(const Ice::Exception&); protected: Request(const LocatorInfoPtr&, const ReferencePtr&); - void response(const Ice::ObjectPrx&); - void exception(const Ice::Exception&); - virtual void send(bool) = 0; const LocatorInfoPtr _locatorInfo; |