diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-30 09:29:42 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-30 09:29:42 -0330 |
| commit | 0a2a4d818fb5c276e6ba008c29b591683d5025bd (patch) | |
| tree | bef463540bcd1ba853b75c8f265845251e819fd6 /cpp/demo/Freeze/library/LibraryI.cpp | |
| parent | Fixed (ICE-6276) - Add support for JavaScript source maps (diff) | |
| download | ice-0a2a4d818fb5c276e6ba008c29b591683d5025bd.tar.bz2 ice-0a2a4d818fb5c276e6ba008c29b591683d5025bd.tar.xz ice-0a2a4d818fb5c276e6ba008c29b591683d5025bd.zip | |
ICE-5814 allow demos to be built with /W4 on Windows
Diffstat (limited to 'cpp/demo/Freeze/library/LibraryI.cpp')
| -rw-r--r-- | cpp/demo/Freeze/library/LibraryI.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp index e10cddb31da..dba787134f5 100644 --- a/cpp/demo/Freeze/library/LibraryI.cpp +++ b/cpp/demo/Freeze/library/LibraryI.cpp @@ -138,10 +138,13 @@ public: private: + // Required to prevent compiler warnings with MSVC++ + IsbnToBook& operator=(const IsbnToBook&); + const Ice::ObjectAdapterPtr _adapter; }; -LibraryI::LibraryI(const Ice::CommunicatorPtr& communicator, +LibraryI::LibraryI(const Ice::CommunicatorPtr& communicator, const string& envName, const string& dbName, const Freeze::EvictorPtr& evictor) : _evictor(evictor), @@ -266,7 +269,7 @@ void LibraryI::remove(const BookDescription& description) { IceUtil::Mutex::Lock lock(*this); - + // // Note: no need to catch and retry on deadlock since all access to // _authors is serialized. @@ -275,7 +278,7 @@ LibraryI::remove(const BookDescription& description) try { StringIsbnSeqDict::iterator p = _authors.find(description.authors); - + assert(p != _authors.end()); // @@ -284,7 +287,7 @@ LibraryI::remove(const BookDescription& description) Ice::StringSeq isbnSeq = p->second; isbnSeq.erase(remove_if(isbnSeq.begin(), isbnSeq.end(), bind2nd(equal_to<string>(), description.isbn)), isbnSeq.end()); - + if(isbnSeq.empty()) { // |