diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-25 16:24:32 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-25 16:24:32 +0000 |
| commit | 77ee1996bb672c6f9072c95a35a7c7cf12db1d66 (patch) | |
| tree | b2caa99114b7ea576283aa9c49937569cc43dd67 /cppe/src | |
| parent | Added proxy comparison test (diff) | |
| download | ice-77ee1996bb672c6f9072c95a35a7c7cf12db1d66.tar.bz2 ice-77ee1996bb672c6f9072c95a35a7c7cf12db1d66.tar.xz ice-77ee1996bb672c6f9072c95a35a7c7cf12db1d66.zip | |
Minor naming convention fix
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Reference.cpp | 6 | ||||
| -rw-r--r-- | cppe/src/IceE/Reference.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp index fe1883d318e..0bb29353ccf 100644 --- a/cppe/src/IceE/Reference.cpp +++ b/cppe/src/IceE/Reference.cpp @@ -480,7 +480,7 @@ IceInternal::FixedReference::getFixedConnections() const Reference::Type IceInternal::FixedReference::getType() const { - return Fixed; + return TypeFixed; } vector<EndpointPtr> @@ -754,7 +754,7 @@ IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const Com Reference::Type IceInternal::DirectReference::getType() const { - return Direct; + return TypeDirect; } vector<EndpointPtr> @@ -964,7 +964,7 @@ IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const Reference::Type IceInternal::IndirectReference::getType() const { - return Indirect; + return TypeIndirect; } vector<EndpointPtr> diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h index 7c2de6714ed..3cd2d511880 100644 --- a/cppe/src/IceE/Reference.h +++ b/cppe/src/IceE/Reference.h @@ -37,6 +37,13 @@ class Reference : public IceUtil::Shared { public: + enum Type + { + TypeDirect, + TypeIndirect, + TypeFixed + }; + enum Mode { ModeTwoway, @@ -47,13 +54,6 @@ public: ModeLast = ModeBatchDatagram }; - enum Type - { - Fixed, - Direct, - Indirect - }; - Mode getMode() const { return _mode; } bool getSecure() const { return _secure; }; const Ice::Identity& getIdentity() const { return _identity; } |