summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/Reference.cpp6
-rw-r--r--cpp/src/Ice/Reference.h14
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 829af4c4dbe..11b33cf6c56 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -441,7 +441,7 @@ IceInternal::FixedReference::getFixedConnections() const
Reference::Type
IceInternal::FixedReference::getType() const
{
- return Fixed;
+ return TypeFixed;
}
bool
@@ -1219,7 +1219,7 @@ IceInternal::DirectReference::getEndpoints() const
Reference::Type
IceInternal::DirectReference::getType() const
{
- return Direct;
+ return TypeDirect;
}
int
@@ -1474,7 +1474,7 @@ IceInternal::IndirectReference::getEndpoints() const
Reference::Type
IceInternal::IndirectReference::getType() const
{
- return Indirect;
+ return TypeIndirect;
}
int
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index caa3a9fb169..a483d612015 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -33,6 +33,13 @@ class Reference : public IceUtil::Shared
{
public:
+ enum Type
+ {
+ TypeDirect,
+ TypeIndirect,
+ TypeFixed
+ };
+
enum Mode
{
ModeTwoway,
@@ -43,13 +50,6 @@ public:
ModeLast = ModeBatchDatagram
};
- enum Type
- {
- Fixed,
- Direct,
- Indirect
- };
-
Mode getMode() const { return _mode; }
const Ice::Identity& getIdentity() const { return _identity; }
const std::string& getFacet() const { return _facet; }