diff --git a/Sources/Plasma/CoreLib/hsThread.cpp b/Sources/Plasma/CoreLib/hsThread.cpp index fe3cf8fa..6c455469 100644 --- a/Sources/Plasma/CoreLib/hsThread.cpp +++ b/Sources/Plasma/CoreLib/hsThread.cpp @@ -47,18 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// -hsReaderWriterLock::hsReaderWriterLock( const char * name, Callback * cb ) +hsReaderWriterLock::hsReaderWriterLock(Callback * cb) : fReaderCount( 0 ) , fWriterSema( 1 ) , fCallback( cb ) -, fName( nil ) { - fName = hsStrcpy( name ); -} - -hsReaderWriterLock::~hsReaderWriterLock() -{ - delete [] fName; } void hsReaderWriterLock::LockForReading() diff --git a/Sources/Plasma/CoreLib/hsThread.h b/Sources/Plasma/CoreLib/hsThread.h index ae5e35f0..88ff8e89 100644 --- a/Sources/Plasma/CoreLib/hsThread.h +++ b/Sources/Plasma/CoreLib/hsThread.h @@ -223,13 +223,11 @@ public: virtual void OnUnlockingForWrite( hsReaderWriterLock * lock ) {} virtual void OnUnlockedForWrite( hsReaderWriterLock * lock ) {} }; - hsReaderWriterLock( const char * name="", Callback * cb=nil ); - ~hsReaderWriterLock(); + hsReaderWriterLock(Callback * cb=nullptr); void LockForReading(); void UnlockForReading(); void LockForWriting(); void UnlockForWriting(); - const char * GetName() const { return fName; } private: int fReaderCount; @@ -237,7 +235,6 @@ private: hsMutex fReaderLock; hsSemaphore fWriterSema; Callback * fCallback; - char * fName; }; class hsLockForReading