diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/AbstractMutex.h | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/PerfLinux.cpp | 1 | ||||
| -rw-r--r-- | cpp/test/IceGrid/perf/Client.cpp | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index 6ee6829da45..83e4df9a678 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -23,6 +23,9 @@ public: typedef LockT<AbstractMutex> Lock; typedef TryLockT<AbstractMutex> TryLock; + virtual ~AbstractMutex() + {}; + virtual void lock() const = 0; virtual void unlock() const = 0; virtual bool tryLock() const = 0; diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index b3b5e404e62..8afcad3376e 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -507,6 +507,8 @@ IceInternal::ReferenceFactory::create(const string& str) throw ex; } } + + return 0; // Unreachable, prevents compiler warning. } ReferencePtr diff --git a/cpp/src/IceGrid/PerfLinux.cpp b/cpp/src/IceGrid/PerfLinux.cpp index 072735a5604..07ac3416085 100644 --- a/cpp/src/IceGrid/PerfLinux.cpp +++ b/cpp/src/IceGrid/PerfLinux.cpp @@ -41,6 +41,7 @@ class Parser { public: + virtual ~Parser() {}; virtual ParsedFileMap::const_iterator parse(const string&, ParsedFileMap&) = 0; }; diff --git a/cpp/test/IceGrid/perf/Client.cpp b/cpp/test/IceGrid/perf/Client.cpp index d961da90f67..9fdeae7a38f 100644 --- a/cpp/test/IceGrid/perf/Client.cpp +++ b/cpp/test/IceGrid/perf/Client.cpp @@ -71,7 +71,6 @@ main(int argc, char* argv[]) cout << keys[i] << ": " << typeId << " "; - bool printed = printIf<BoxedString>(dataSeq[i], cout) || printIf<BoxedInt>(dataSeq[i], cout) || printIf<BoxedLong>(dataSeq[i], cout) |