diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-02-09 16:31:31 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-02-09 16:31:31 -0800 |
| commit | af409fe78bdca7db6315ab0cc99ad063f8daecf7 (patch) | |
| tree | b0079f556247a14f43e77ca6a31cb42df019485b /cpp/src/Ice | |
| parent | Fixed enum-related warnings (diff) | |
| download | ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.tar.bz2 ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.tar.xz ice-af409fe78bdca7db6315ab0cc99ad063f8daecf7.zip | |
ICE-7560 - more AMI test fixes, renaming ConnectionClose enumerators
Diffstat (limited to 'cpp/src/Ice')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 223326203d1..1341cc44e5b 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -498,17 +498,17 @@ Ice::ConnectionI::close(ConnectionClose mode) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - if(mode == ICE_ENUM(ConnectionClose, CloseForcefully)) + if(mode == ICE_SCOPED_ENUM(ConnectionClose, Forcefully)) { setState(StateClosed, ConnectionManuallyClosedException(__FILE__, __LINE__, false)); } - else if(mode == ICE_ENUM(ConnectionClose, CloseGracefully)) + else if(mode == ICE_SCOPED_ENUM(ConnectionClose, Gracefully)) { setState(StateClosing, ConnectionManuallyClosedException(__FILE__, __LINE__, true)); } else { - assert(mode == ICE_ENUM(ConnectionClose, CloseGracefullyAndWait)); + assert(mode == ICE_SCOPED_ENUM(ConnectionClose, GracefullyWithWait)); // // Wait until all outstanding requests have been completed. |