diff options
| author | Michi Henning <michi@zeroc.com> | 2003-10-20 23:55:02 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-10-20 23:55:02 +0000 |
| commit | cc4d0fd9a299bc18ce67fb3cbee5884e587bc480 (patch) | |
| tree | 6c3a1f06bc9496210dadf0187d6c2100fcaacd9a /cpp/src | |
| parent | Fixed bug in code generation for garbage collector: code for dictionaries (diff) | |
| download | ice-cc4d0fd9a299bc18ce67fb3cbee5884e587bc480.tar.bz2 ice-cc4d0fd9a299bc18ce67fb3cbee5884e587bc480.tar.xz ice-cc4d0fd9a299bc18ce67fb3cbee5884e587bc480.zip | |
Got rid of warning on Suns.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/Connection.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 753637d58be..a5e86441a70 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1447,9 +1447,9 @@ IceInternal::BasicStream::readPendingObjects() } void -IceInternal::BasicStream::marshalFacets(bool b) +IceInternal::BasicStream::marshalFacets(bool doMarshal) { - _marshalFacets = b; + _marshalFacets = doMarshal; } void diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index f80cdc8ac67..e513d788bbd 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -772,7 +772,7 @@ IceInternal::Connection::sendResponse(BasicStream* os, Byte compressFlag) { { // See _queryMutex comment in header file. - IceUtil::Mutex::Lock sync(_queryMutex); + IceUtil::Mutex::Lock s(_queryMutex); --_dispatchCount; } @@ -863,7 +863,7 @@ IceInternal::Connection::sendNoResponse() { { // See _queryMutex comment in header file. - IceUtil::Mutex::Lock sync(_queryMutex); + IceUtil::Mutex::Lock s(_queryMutex); --_dispatchCount; } @@ -1070,7 +1070,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa invoke = 1; { // See _queryMutex comment in header file. - IceUtil::Mutex::Lock sync(_queryMutex); + IceUtil::Mutex::Lock s(_queryMutex); ++_dispatchCount; } } @@ -1095,7 +1095,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa } { // See _queryMutex comment in header file. - IceUtil::Mutex::Lock sync(_queryMutex); + IceUtil::Mutex::Lock s(_queryMutex); _dispatchCount += invoke; } } @@ -1307,7 +1307,7 @@ IceInternal::Connection::finished(const ThreadPoolPtr& threadPool) _transceiver->close(); { // See _queryMutex comment in header file. - IceUtil::Mutex::Lock sync(_queryMutex); + IceUtil::Mutex::Lock s(_queryMutex); _transceiver = 0; } _threadPool = 0; // We don't need the thread pool anymore. |