diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Ice/Locator.ice | 4 | ||||
| -rw-r--r-- | cpp/slice/Ice/Process.ice | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice index 67ac7ca3568..7618457627c 100644 --- a/cpp/slice/Ice/Locator.ice +++ b/cpp/slice/Ice/Locator.ice @@ -17,7 +17,9 @@ #ifndef ICE_NO_LOCATOR #include <Ice/Identity.ice> +#ifndef ICEE #include <Ice/ProcessF.ice> +#endif module Ice { @@ -151,6 +153,7 @@ interface LocatorRegistry ["amd"] idempotent void setAdapterDirectProxy(string id, Object* proxy) throws AdapterNotFoundException, AdapterAlreadyActiveException; +#ifndef ICEE /** * * Set the process proxy for a server. @@ -165,6 +168,7 @@ interface LocatorRegistry **/ ["amd"] idempotent void setServerProcessProxy(string id, Process* proxy) throws ServerNotFoundException; +#endif }; }; diff --git a/cpp/slice/Ice/Process.ice b/cpp/slice/Ice/Process.ice index 43964e9cd68..89345384364 100644 --- a/cpp/slice/Ice/Process.ice +++ b/cpp/slice/Ice/Process.ice @@ -10,12 +10,6 @@ #ifndef ICE_PROCESS_ICE #define ICE_PROCESS_ICE -#ifdef ICEE -#include <Ice/IceEConfig.ice> -#endif - -#ifndef ICE_NO_LOCATOR - module Ice { @@ -59,5 +53,3 @@ interface Process }; #endif - -#endif |