diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-02-08 18:02:47 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-02-08 18:02:47 -0500 |
| commit | cee5e5067eff15b5a22a247805edb6c8dda77074 (patch) | |
| tree | e67d772a753e3ffa491571a101afb43a24824e5e /cpp/src/Ice/Reference.cpp | |
| parent | Update Debug settings for VS 2017 (VC141) (diff) | |
| download | ice-cee5e5067eff15b5a22a247805edb6c8dda77074.tar.bz2 ice-cee5e5067eff15b5a22a247805edb6c8dda77074.tar.xz ice-cee5e5067eff15b5a22a247805edb6c8dda77074.zip | |
Removed cpp:unscoped from all Ice enums
CompressBatch is now "scoped" in C++98 and ObjC
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index b222b506352..99bcdcdf030 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -643,7 +643,7 @@ IceInternal::FixedReference::getPreferSecure() const Ice::EndpointSelectionType IceInternal::FixedReference::getEndpointSelection() const { - return Random; + return ICE_ENUM(EndpointSelectionType, Random); } int @@ -1262,7 +1262,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const properties[prefix + ".CollocationOptimized"] = _collocationOptimized ? "1" : "0"; properties[prefix + ".ConnectionCached"] = _cacheConnection ? "1" : "0"; properties[prefix + ".PreferSecure"] = _preferSecure ? "1" : "0"; - properties[prefix + ".EndpointSelection"] = _endpointSelection == Random ? "Random" : "Ordered"; + properties[prefix + ".EndpointSelection"] = _endpointSelection == ICE_ENUM(EndpointSelectionType, Random) ? "Random" : "Ordered"; { ostringstream s; s << _locatorCacheTimeout; @@ -1916,13 +1916,13 @@ IceInternal::RoutableReference::filterEndpoints(const vector<EndpointIPtr>& allE // switch(getEndpointSelection()) { - case Random: + case ICE_ENUM(EndpointSelectionType, Random): { RandomNumberGenerator rng; random_shuffle(endpoints.begin(), endpoints.end(), rng); break; } - case Ordered: + case ICE_ENUM(EndpointSelectionType, Ordered): { // Nothing to do. break; |