diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-06-03 19:32:20 -0700 |
| commit | 3d649bed4328992f41f567136025f58a019a5159 (patch) | |
| tree | 470be901fbbfe5c6cd4269884412b0d36b48dc92 /cppe/include/IceE/ObjectAdapter.h | |
| parent | local interface fixes for slice2javae (diff) | |
| download | ice-3d649bed4328992f41f567136025f58a019a5159.tar.bz2 ice-3d649bed4328992f41f567136025f58a019a5159.tar.xz ice-3d649bed4328992f41f567136025f58a019a5159.zip | |
Various Ice-E fixes:
- Bug fix in slice2javae for local interfaces/classes
- Added Ice.LocalObjectHolder
- Reviewed Java/C++ demos and aligned with Ice
- Source code clean up (removed tabs, etc.)
Diffstat (limited to 'cppe/include/IceE/ObjectAdapter.h')
| -rw-r--r-- | cppe/include/IceE/ObjectAdapter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h index 5d44274bd3b..3eb4d4a226f 100644 --- a/cppe/include/IceE/ObjectAdapter.h +++ b/cppe/include/IceE/ObjectAdapter.h @@ -91,11 +91,11 @@ public: private: ObjectAdapter(const IceInternal::InstancePtr&, const CommunicatorPtr&, const IceInternal::ObjectAdapterFactoryPtr&, - const std::string&, const std::string& + const std::string&, const std::string& #ifdef ICEE_HAS_ROUTER - , const RouterPrx& + , const RouterPrx& #endif - ); + ); ~ObjectAdapter(); friend class IceInternal::ObjectAdapterFactory; |