diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/MapI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Freeze/SharedDb.cpp | 5 | ||||
| -rwxr-xr-x | cpp/src/Ice/Service.cpp | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 0b521017f27..631aa714aad 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -729,7 +729,9 @@ Freeze::MapHelperI::MapHelperI(const ConnectionIPtr& connection, const MapIndexBasePtr& indexBase = *p; assert(indexBase->_impl != 0); assert(indexBase->_map == 0); - bool inserted = +#ifndef NDEBUG + bool inserted = +#endif _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second; assert(inserted); indexBase->_map = this; diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp index 2e8cf4692f0..0f40586eac0 100644 --- a/cpp/src/Freeze/SharedDb.cpp +++ b/cpp/src/Freeze/SharedDb.cpp @@ -278,7 +278,10 @@ Freeze::SharedDb::SharedDb(const MapKey& mapKey, auto_ptr<MapIndexI> indexI(new MapIndexI(connection, *this, txn, createDb, indexBase)); - bool inserted = _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second; +#ifndef NDEBUG + bool inserted = +#endif + _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second; assert(inserted); indexBase->_impl = indexI.release(); diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index f6bf83ac991..d63484dbe55 100755 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -1434,7 +1434,7 @@ Ice::Service::runDaemon(int argc, char* argv[]) } fd_set fdsToClose; - int fdMax; + int fdMax = 0; if(_closeFiles) { // |