diff options
author | Benoit Foucher <benoit@zeroc.com> | 2007-05-04 09:29:36 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2007-05-04 09:29:36 +0000 |
commit | 370561355363d554a57fddae057dd7365fe055ac (patch) | |
tree | 183acc5269fe916e6459fd03310c5d53e21c6224 /cppe/src/IceE/Outgoing.cpp | |
parent | Bug 1022. (diff) | |
download | ice-370561355363d554a57fddae057dd7365fe055ac.tar.bz2 ice-370561355363d554a57fddae057dd7365fe055ac.tar.xz ice-370561355363d554a57fddae057dd7365fe055ac.zip |
Fixed bug 2177
Diffstat (limited to 'cppe/src/IceE/Outgoing.cpp')
-rw-r--r-- | cppe/src/IceE/Outgoing.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp index d2573a78784..b428342ae3b 100644 --- a/cppe/src/IceE/Outgoing.cpp +++ b/cppe/src/IceE/Outgoing.cpp @@ -58,22 +58,22 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st { switch(_reference->getMode()) { - case Reference::ModeTwoway: - case Reference::ModeOneway: + case ReferenceModeTwoway: + case ReferenceModeOneway: { _stream.writeBlob(requestHdr, sizeof(requestHdr)); break; } - case Reference::ModeBatchOneway: + case ReferenceModeBatchOneway: #ifdef ICEE_HAS_BATCH { _connection->prepareBatchRequest(&_stream); break; } #endif - case Reference::ModeDatagram: - case Reference::ModeBatchDatagram: + case ReferenceModeDatagram: + case ReferenceModeBatchDatagram: { assert(false); break; @@ -134,7 +134,7 @@ IceInternal::Outgoing::invoke() switch(_reference->getMode()) { - case Reference::ModeTwoway: + case ReferenceModeTwoway: { // // We let all exceptions raised by sending directly @@ -182,7 +182,7 @@ IceInternal::Outgoing::invoke() break; } - case Reference::ModeOneway: + case ReferenceModeOneway: { // // For oneway requests, the connection object @@ -196,7 +196,7 @@ IceInternal::Outgoing::invoke() break; } - case Reference::ModeBatchOneway: + case ReferenceModeBatchOneway: #ifdef ICEE_HAS_BATCH { // @@ -208,8 +208,8 @@ IceInternal::Outgoing::invoke() break; } #endif - case Reference::ModeDatagram: - case Reference::ModeBatchDatagram: + case ReferenceModeDatagram: + case ReferenceModeBatchDatagram: { assert(false); return false; @@ -230,7 +230,7 @@ IceInternal::Outgoing::abort(const LocalException& ex) // batch stream. // #ifdef ICEE_HAS_BATCH - if(_reference->getMode() == Reference::ModeBatchOneway) + if(_reference->getMode() == ReferenceModeBatchOneway) { _connection->abortBatchRequest(); @@ -249,7 +249,7 @@ IceInternal::Outgoing::abort(const LocalException& ex) void IceInternal::Outgoing::finished(BasicStream& is) { - assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways. + assert(_reference->getMode() == ReferenceModeTwoway); // Can only be called for twoways. assert(_state <= StateInProgress); // @@ -418,7 +418,7 @@ IceInternal::Outgoing::finished(BasicStream& is) void IceInternal::Outgoing::finished(const LocalException& ex) { - assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways. + assert(_reference->getMode() == ReferenceModeTwoway); // Can only be called for twoways. assert(_state <= StateInProgress); _state = StateLocalException; |