diff options
| author | Jose <jose@zeroc.com> | 2014-08-13 22:35:04 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-08-13 22:35:04 +0200 |
| commit | dcac8395dec1255b45c71064113b175f4f15c51c (patch) | |
| tree | 6949297924ad5028ee3d3ee3322a344b9000a6b1 | |
| parent | Add JS properties test to makefiles (diff) | |
| download | ice-dcac8395dec1255b45c71064113b175f4f15c51c.tar.bz2 ice-dcac8395dec1255b45c71064113b175f4f15c51c.tar.xz ice-dcac8395dec1255b45c71064113b175f4f15c51c.zip | |
Fix problem introduced with ICE-5553 fix
| -rw-r--r-- | cpp/include/IceUtil/AbstractMutex.h | 3 | ||||
| -rw-r--r-- | cpp/src/IceUtil/RecMutex.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index 3c2c11ac555..8c4e6f457b5 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -25,7 +25,8 @@ public: typedef TryLockT<AbstractMutex> TryLock; virtual ~AbstractMutex() - {}; + { + } virtual void lock() const = 0; virtual void unlock() const = 0; diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp index 0873ebbf374..32e4009b60b 100644 --- a/cpp/src/IceUtil/RecMutex.cpp +++ b/cpp/src/IceUtil/RecMutex.cpp @@ -10,6 +10,12 @@ #include <IceUtil/RecMutex.h> #include <IceUtil/Exception.h> +// +// AbstractMutex isn't used anywhere in IceUtil, we include it here +// to give the compiler a chance to export the class symbols. +// +#include <IceUtil/AbstractMutex.h> + using namespace std; IceUtil::RecMutex::RecMutex() : |