mirror/ctemplate
1
0
Fork 0
mirror of https://github.com/OlafvdSpek/ctemplate.git synced 2025-09-28 19:05:49 +08:00
Code Issues Releases Wiki Activity

Put Mutex in the same namespace as the other template code. I don't see

Browse Source 
a good reason not to, and it's making it hard to
forward-declare Mutex otherwise.

Note that with this change, Mutex is not available from the
global namespace (which it was before due to the using
statement), which I think is a good thing.

R=ribrdb
DELTA=16  (1 added, 9 deleted, 6 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=2767
This commit is contained in:
csilvers+ctemplate@google.com 2011-07-28 07:45:57 +00:00
parent 6dd1aabba0
commit eac74d19c8
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/base/mutex.h
View File

@ -158,16 +158,12 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> // for abort() #include <stdlib.h> // for abort()
#define MUTEX_NAMESPACE ctemplate_mutex_namespace
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_
namespace base { namespace base {
// This is used for the single-arg constructor // This is used for the single-arg constructor
enum LinkerInitialized { LINKER_INITIALIZED }; enum LinkerInitialized { LINKER_INITIALIZED };
} }
_END_GOOGLE_NAMESPACE_
namespace MUTEX_NAMESPACE {
class Mutex { class Mutex {
public: public:
@ -178,7 +174,7 @@ class Mutex {
// It inhibits work being done by the destructor, which makes it // It inhibits work being done by the destructor, which makes it
// safer for code that tries to acqiure this mutex in their global // safer for code that tries to acqiure this mutex in their global
// destructor. // destructor.
inline Mutex(GOOGLE_NAMESPACE::base::LinkerInitialized); inline Mutex(base::LinkerInitialized);
// Destructor // Destructor
inline ~Mutex(); inline ~Mutex();
@ -233,7 +229,7 @@ class Mutex {
// assert. // assert.
Mutex::Mutex() : mutex_(0) { } Mutex::Mutex() : mutex_(0) { }
Mutex::Mutex(GOOGLE_NAMESPACE::base::LinkerInitialized) : mutex_(0) { } Mutex::Mutex(base::LinkerInitialized) : mutex_(0) { }
Mutex::~Mutex() { assert(mutex_ == 0); } Mutex::~Mutex() { assert(mutex_ == 0); }
void Mutex::Lock() { assert(--mutex_ == -1); } void Mutex::Lock() { assert(--mutex_ == -1); }
void Mutex::Unlock() { assert(mutex_++ == -1); } void Mutex::Unlock() { assert(mutex_++ == -1); }
@ -258,7 +254,7 @@ Mutex::Mutex() : destroy_(true) {
InitializeCriticalSection(&mutex_); InitializeCriticalSection(&mutex_);
SetIsSafe(); SetIsSafe();
} }
Mutex::Mutex(GOOGLE_NAMESPACE::base::LinkerInitialized) : destroy_(false) { Mutex::Mutex(base::LinkerInitialized) : destroy_(false) {
InitializeCriticalSection(&mutex_); InitializeCriticalSection(&mutex_);
SetIsSafe(); SetIsSafe();
} }
@ -308,7 +304,7 @@ Mutex::Mutex() : destroy_(true) {
SetIsSafe(); SetIsSafe();
if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort(); if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort();
} }
Mutex::Mutex(GOOGLE_NAMESPACE::base::LinkerInitialized) : destroy_(false) { Mutex::Mutex(base::LinkerInitialized) : destroy_(false) {
SetIsSafe(); SetIsSafe();
if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort(); if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort();
} }
@ -340,7 +336,7 @@ Mutex::Mutex() : destroy_(true) {
SetIsSafe(); SetIsSafe();
if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort(); if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort();
} }
Mutex::Mutex(GOOGLE_NAMESPACE::base::LinkerInitialized) : destroy_(false) { Mutex::Mutex(base::LinkerInitialized) : destroy_(false) {
SetIsSafe(); SetIsSafe();
if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort(); if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort();
} }
@ -407,10 +403,6 @@ class WriterMutexLock {
#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name) #define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name) #define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
} // namespace MUTEX_NAMESPACE _END_GOOGLE_NAMESPACE_
using namespace MUTEX_NAMESPACE;
#undef MUTEX_NAMESPACE
#endif /* #define GOOGLE_MUTEX_H__ */ #endif /* #define GOOGLE_MUTEX_H__ */