Index: ext/libicpf/src/mutex.h =================================================================== diff -u -N -r2e89265740d37576aaef5a9cdd965349eda4e3d3 -r30ed05249d32bbb24596169c77afa3c878299cb3 --- ext/libicpf/src/mutex.h (.../mutex.h) (revision 2e89265740d37576aaef5a9cdd965349eda4e3d3) +++ ext/libicpf/src/mutex.h (.../mutex.h) (revision 30ed05249d32bbb24596169c77afa3c878299cb3) @@ -49,6 +49,8 @@ /** \name Construction/destruction */ /**@{*/ mutex(); ///< Standard constructor + // the constructor below will not be excluded without ENABLE_MUTEX_DEBUGGING, sice it would require + // too much changes throughout the code that once was designed for debugging. mutex(const char_t* /*pszStr*/); ///< Helper constructor, used as a compatibility layer with d_mutex virtual ~mutex(); ///< Standard destructor @@ -58,22 +60,17 @@ /**@{*/ void lock(); ///< Locks this mutex void unlock(); ///< Unlocks this mutex +#ifdef ENABLE_MUTEX_DEBUGGING void lock(const char_t* /*pszFile*/, ulong_t /*ulLine*/, const char_t* /*pszFunction*/); ///< Locks this mutex (compatibility layer with d_mutex) void unlock(const char_t* /*pszFile*/, ulong_t /*ulLine*/, const char_t* /*pszFunction*/); ///< Unlocks this mutex (compatibility layer with d_mutex) +#endif /**@}*/ protected: void construct(); ///< Helper function - initializes the internal members, used by constructors private: void* m_pLock; ///< Pointer to a system-specific structure used to lock -//#ifdef _WIN32 -// /// Underlying windows locking structure -// CRITICAL_SECTION m_cs; -//#else -// /// Underlying linux locking structure/handle -// pthread_mutex_t m_mutex; -//#endif }; END_ICPF_NAMESPACE