diff --git a/pvDataApp/misc/lock.h b/pvDataApp/misc/lock.h index 149bcd7..fc79c70 100644 --- a/pvDataApp/misc/lock.h +++ b/pvDataApp/misc/lock.h @@ -15,19 +15,7 @@ namespace epics { namespace pvData { -class Mutex { -public: - Mutex() : id(epicsMutexCreate()) - {if(!id) throw std::bad_alloc();} - ~Mutex() { epicsMutexDestroy(id) ;} - void lock(){ - if(epicsMutexLock(id)!=epicsMutexLockOK) - throw std::logic_error("Failed to acquire Mutex"); - } - void unlock(){epicsMutexUnlock(id);} -private: - epicsMutexId id; -}; +typedef epicsMutex Mutex; class Lock : private NoDefaultMethods { public: diff --git a/pvDataApp/misc/timer.cpp b/pvDataApp/misc/timer.cpp index 1ee0eab..4b278a7 100644 --- a/pvDataApp/misc/timer.cpp +++ b/pvDataApp/misc/timer.cpp @@ -64,7 +64,7 @@ public: // only used by this source module Timer::Pvt::Pvt(String threadName,ThreadPriority priority) : timerList(), - mutex(Mutex()), + mutex(), waitForWork(false), waitForDone(false), alive(true),