diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-07-28 16:03:19 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-07-28 16:03:19 +0000 |
| commit | ef3230f9a7e38dfe90c875656d05d93ce5c63721 (patch) | |
| tree | 898c17759f6dd646ba1cd7ac6374cfb945ce330f /cppe/src | |
| parent | adding JAD file task def and fixing demo MIDlet build (diff) | |
| download | ice-ef3230f9a7e38dfe90c875656d05d93ce5c63721.tar.bz2 ice-ef3230f9a7e38dfe90c875656d05d93ce5c63721.tar.xz ice-ef3230f9a7e38dfe90c875656d05d93ce5c63721.zip | |
Fix compiler warnings
Diffstat (limited to 'cppe/src')
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 18 | ||||
| -rw-r--r-- | cppe/src/IceE/Outgoing.cpp | 18 | ||||
| -rw-r--r-- | cppe/src/IceE/Reference.cpp | 7 |
3 files changed, 32 insertions, 11 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index fecc9664de2..c699502e26c 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -711,24 +711,24 @@ Ice::Connection::Connection(const InstancePtr& instance, _desc(transceiver->toString()), _type(transceiver->type()), _endpoint(endpoint), -#ifndef ICEE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT _adapter(adapter), -#endif
+#endif _logger(_instance->logger()), // Cached for better performance. _traceLevels(_instance->traceLevels()), // Cached for better performance. _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0), _requestHdr(headerSize + sizeof(Int), 0), -#ifdef ICEE_HAS_BATCH - _requestBatchHdr(headerSize + sizeof(Int), 0), - _batchStream(_instance.get()),
- _batchStreamInUse(false),
- _batchRequestNum(0),
-#endif #ifndef ICEE_PURE_CLIENT _replyHdr(headerSize, 0), #endif _nextRequestId(1), _requestsHint(_requests.end()), +#ifdef ICEE_HAS_BATCH + _requestBatchHdr(headerSize + sizeof(Int), 0), + _batchStream(_instance.get()), + _batchStreamInUse(false), + _batchRequestNum(0), +#endif _dispatchCount(0), _state(StateNotValidated), _stateTime(IceUtil::Time::now()) @@ -1534,8 +1534,8 @@ Ice::Connection::run() } Int requestId = 0; - Int invokeNum = 0; #ifndef ICEE_PURE_CLIENT + Int invokeNum = 0; ServantManagerPtr servantManager; ObjectAdapterPtr adapter; #endif diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp index d4c2dcbcf1c..5565c5ac4f2 100644 --- a/cppe/src/IceE/Outgoing.cpp +++ b/cppe/src/IceE/Outgoing.cpp @@ -58,6 +58,13 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st break; } #endif + default: + { + // + // TODO: Should this assert? + // + break; + } } _reference->getIdentity().__write(&_os); @@ -230,7 +237,7 @@ IceInternal::Outgoing::invoke() break; } -#ifdef ICEE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH case Reference::ModeBatchOneway: { // @@ -241,8 +248,15 @@ IceInternal::Outgoing::invoke() _state = StateInProgress; _connection->finishBatchRequest(&_os); break; - }
+ } #endif + default: + { + // + // TODO: Should this assert? + // + return false; + } } return true; diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp index c5a6594d1e5..3742ecc6d2e 100644 --- a/cppe/src/IceE/Reference.cpp +++ b/cppe/src/IceE/Reference.cpp @@ -266,6 +266,13 @@ IceInternal::Reference::toString() const break; } #endif + default: + { + // + // TODO: Should this assert? + // + break; + } } return s; |