diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-08-12 14:35:27 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-08-12 14:35:27 +0000 |
| commit | f19fe14d24b89120beba2e39920f2a1f7e1b958c (patch) | |
| tree | 7fb98017e021d0b0ee074c474caf697219a2d9c2 /cppe/include/IceE/ObjectAdapter.h | |
| parent | change line endings (diff) | |
| download | ice-f19fe14d24b89120beba2e39920f2a1f7e1b958c.tar.bz2 ice-f19fe14d24b89120beba2e39920f2a1f7e1b958c.tar.xz ice-f19fe14d24b89120beba2e39920f2a1f7e1b958c.zip | |
Some ICE_ to ICEE_ renamings
Diffstat (limited to 'cppe/include/IceE/ObjectAdapter.h')
| -rwxr-xr-x | cppe/include/IceE/ObjectAdapter.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h index d8414e64626..7d2c0ca6a62 100755 --- a/cppe/include/IceE/ObjectAdapter.h +++ b/cppe/include/IceE/ObjectAdapter.h @@ -7,8 +7,8 @@ //
// **********************************************************************
-#ifndef ICE_OBJECT_ADAPTER_H
-#define ICE_OBJECT_ADAPTER_H
+#ifndef ICEE_OBJECT_ADAPTER_H
+#define ICEE_OBJECT_ADAPTER_H
#include <IceE/ObjectAdapterF.h>
#include <IceE/InstanceF.h>
@@ -20,11 +20,11 @@ #include <IceE/ObjectF.h>
#include <IceE/EndpointF.h>
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
# include <IceE/RouterF.h>
#endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
# include <IceE/LocatorF.h>
# include <IceE/LocatorInfoF.h>
#endif
@@ -70,10 +70,10 @@ public: ObjectPrx createDirectProxy(const Identity&) const;
ObjectPrx createReverseProxy(const Identity&) const;
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
void addRouter(const RouterPrx&);
#endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
void setLocator(const LocatorPrx&);
#endif
@@ -106,11 +106,11 @@ private: const std::string _name;
const std::string _id;
std::vector<IceInternal::IncomingConnectionFactoryPtr> _incomingConnectionFactories;
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
std::vector<IceInternal::EndpointPtr> _routerEndpoints;
#endif
std::vector<IceInternal::EndpointPtr> _publishedEndpoints;
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
IceInternal::LocatorInfoPtr _locatorInfo;
#endif
int _directCount; // The number of direct proxies dispatching on this object adapter.
|