diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-09-13 15:33:46 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-13 15:33:46 +0200 |
commit | 0ed3e3fff565b80f84ec7e23d821fd30fac89b86 (patch) | |
tree | c9f4157f23727413b34d33f12f67e891879d3a77 /cpp/src/Ice/PropertiesAdminI.h | |
parent | Merge remote-tracking branch 'origin/mx' into mx (diff) | |
download | ice-0ed3e3fff565b80f84ec7e23d821fd30fac89b86.tar.bz2 ice-0ed3e3fff565b80f84ec7e23d821fd30fac89b86.tar.xz ice-0ed3e3fff565b80f84ec7e23d821fd30fac89b86.zip |
Added Ice/metrics test
Diffstat (limited to 'cpp/src/Ice/PropertiesAdminI.h')
-rw-r--r-- | cpp/src/Ice/PropertiesAdminI.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h index 17235ddb313..c0c22a9a0ff 100644 --- a/cpp/src/Ice/PropertiesAdminI.h +++ b/cpp/src/Ice/PropertiesAdminI.h @@ -10,14 +10,14 @@ #ifndef ICE_PROPERTIES_ADMIN_I_H #define ICE_PROPERTIES_ADMIN_I_H -#include <IceUtil/Mutex.h> +#include <IceUtil/RecMutex.h> #include <Ice/PropertiesAdmin.h> #include <Ice/LoggerF.h> namespace Ice { -class ICE_API PropertiesAdminI : public PropertiesAdmin, public NativePropertiesAdmin, private IceUtil::Mutex +class ICE_API PropertiesAdminI : public PropertiesAdmin, public NativePropertiesAdmin, private IceUtil::RecMutex { public: |