diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-03-29 16:48:59 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-03-29 16:48:59 +0000 |
| commit | cad1d61bfdb548d46855bf58fa2800334ae6477a (patch) | |
| tree | 0d3af12fdf648b99e750f96272b2cbf5840e25c0 /cpp | |
| parent | Removed protocol plugin support (diff) | |
| download | ice-cad1d61bfdb548d46855bf58fa2800334ae6477a.tar.bz2 ice-cad1d61bfdb548d46855bf58fa2800334ae6477a.tar.xz ice-cad1d61bfdb548d46855bf58fa2800334ae6477a.zip | |
More slice Ice-E changes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Ice/Communicator.ice | 6 | ||||
| -rw-r--r-- | cpp/slice/Ice/LocalException.ice | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice index b733a9755fe..9d68ef507e3 100644 --- a/cpp/slice/Ice/Communicator.ice +++ b/cpp/slice/Ice/Communicator.ice @@ -17,7 +17,9 @@ #include <Ice/ObjectFactoryF.ice> #include <Ice/RouterF.ice> #include <Ice/LocatorF.ice> -#include <Ice/PluginF.ice> +#ifndef ICEE +# include <Ice/PluginF.ice> +#endif #include <Ice/Current.ice> /** @@ -396,6 +398,7 @@ local interface Communicator **/ void setDefaultLocator(Locator* loc); +#ifndef ICEE /** * * Get the plug-in manager for this communicator. @@ -406,6 +409,7 @@ local interface Communicator * **/ nonmutating PluginManager getPluginManager(); +#endif /** * diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice index 80ce85f0bbd..65aa5fbf74b 100644 --- a/cpp/slice/Ice/LocalException.ice +++ b/cpp/slice/Ice/LocalException.ice @@ -740,6 +740,7 @@ local exception NegativeSizeException extends MarshalException { }; +#ifndef ICEE /** * * This exception indicates that a failure occurred while initializing @@ -755,6 +756,7 @@ local exception PluginInitializationException **/ string reason; }; +#endif /** * |