diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Ice/ObjectAdapter.ice | 6 | ||||
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index ec4f5e5b1e4..13503234baf 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -11,7 +11,9 @@ #define ICE_OBJECT_ADAPTER_ICE #include <Ice/CommunicatorF.ice> -#include <Ice/ServantLocatorF.ice> +#ifndef ICEE +# include <Ice/ServantLocatorF.ice> +#endif #include <Ice/RouterF.ice> #include <Ice/LocatorF.ice> #include <Ice/Identity.ice> @@ -372,6 +374,7 @@ local interface ObjectAdapter **/ nonmutating Object findByProxy(Object* proxy); +#ifndef ICEE /** * * Add a Servant Locator to this object adapter. Adding a servant @@ -439,6 +442,7 @@ local interface ObjectAdapter * **/ nonmutating ServantLocator findServantLocator(string category); +#endif /** * diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index c55acf4e2c2..7ae59041205 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -187,7 +187,6 @@ Slice::Gen::generate(const UnitPtr& p) H << "\n#include <Ice/Object.h>"; H << "\n#include <Ice/Outgoing.h>"; H << "\n#include <Ice/Incoming.h>"; - H << "\n#include <Ice/Direct.h>"; C << "\n#include <Ice/LocalException.h>"; } |