diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/Mutex.h | |
parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/Mutex.h')
-rw-r--r-- | src/Platform/Mutex.h | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/Platform/Mutex.h b/src/Platform/Mutex.h index f97173b4..7289c5ce 100644 --- a/src/Platform/Mutex.h +++ b/src/Platform/Mutex.h @@ -3,63 +3,63 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. -*/
-
-#ifndef TC_HEADER_Platform_Mutex
-#define TC_HEADER_Platform_Mutex
-
-#ifdef TC_WINDOWS
-# include "System.h"
-#else
-# include <pthread.h>
-#endif
-#include "PlatformBase.h"
-
-namespace VeraCrypt
-{
- class Mutex
- {
-#ifdef TC_WINDOWS
- typedef CRITICAL_SECTION SystemMutex_t;
-#else
- typedef pthread_mutex_t SystemMutex_t;
-#endif
-
- public:
- Mutex ();
- ~Mutex ();
-
- SystemMutex_t *GetSystemHandle () { return &SystemMutex; }
- void Lock ();
- void Unlock ();
-
- protected:
- bool Initialized;
- SystemMutex_t SystemMutex;
-
- private:
- Mutex (const Mutex &);
- Mutex &operator= (const Mutex &);
- };
-
- class ScopeLock
- {
- public:
- ScopeLock (Mutex &mutex) : ScopeMutex (mutex) { mutex.Lock(); }
- ~ScopeLock () { ScopeMutex.Unlock(); }
-
- protected:
- Mutex &ScopeMutex;
-
- private:
- ScopeLock (const ScopeLock &);
- ScopeLock &operator= (const ScopeLock &);
- };
-}
-
-#endif // TC_HEADER_Platform_Mutex
+*/ + +#ifndef TC_HEADER_Platform_Mutex +#define TC_HEADER_Platform_Mutex + +#ifdef TC_WINDOWS +# include "System.h" +#else +# include <pthread.h> +#endif +#include "PlatformBase.h" + +namespace VeraCrypt +{ + class Mutex + { +#ifdef TC_WINDOWS + typedef CRITICAL_SECTION SystemMutex_t; +#else + typedef pthread_mutex_t SystemMutex_t; +#endif + + public: + Mutex (); + ~Mutex (); + + SystemMutex_t *GetSystemHandle () { return &SystemMutex; } + void Lock (); + void Unlock (); + + protected: + bool Initialized; + SystemMutex_t SystemMutex; + + private: + Mutex (const Mutex &); + Mutex &operator= (const Mutex &); + }; + + class ScopeLock + { + public: + ScopeLock (Mutex &mutex) : ScopeMutex (mutex) { mutex.Lock(); } + ~ScopeLock () { ScopeMutex.Unlock(); } + + protected: + Mutex &ScopeMutex; + + private: + ScopeLock (const ScopeLock &); + ScopeLock &operator= (const ScopeLock &); + }; +} + +#endif // TC_HEADER_Platform_Mutex |