diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-04 21:29:56 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-04 21:29:56 +0000 |
| commit | eef17bef9df63db752a7bf61e0b5eb0bb8e2c53a (patch) | |
| tree | 85bfba2d5ae8b3cbf54d029a8e5b99b62ab9c5d8 /ace/Singleton.cpp | |
| parent | 099b967f5335f5c61059346728838f4f5f035702 (diff) | |
| download | ATCD-eef17bef9df63db752a7bf61e0b5eb0bb8e2c53a.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/Singleton.cpp')
| -rw-r--r-- | ace/Singleton.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index bdde77ad1b5..6b098b29791 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -40,13 +40,13 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void) #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ } -template <class TYPE, class ACE_LOCK> LOCK & +template <class TYPE, class ACE_LOCK> ACE_LOCK & ACE_Singleton<TYPE, ACE_LOCK>::singleton_lock_i (void) { #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) // Lock the creation of the singleton. This works around a // "feature" of G++... ;-) - static LOCK ace_singleton_lock_; + static ACE_LOCK ace_singleton_lock_; return ace_singleton_lock_; #else @@ -91,7 +91,7 @@ template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> * ACE_Singleton<TYPE, ACE_LOCK>::singleton_ = 0; // Lock the creation of the singleton. -template <class TYPE, class ACE_LOCK> LOCK +template <class TYPE, class ACE_LOCK> ACE_LOCK ACE_Singleton<TYPE, ACE_LOCK>::ace_singleton_lock_; #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ @@ -119,7 +119,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) // Lock the creation of the singleton. This works around a // "feature" of G++... ;-) - static LOCK ace_singleton_lock_; + static ACE_LOCK ace_singleton_lock_; // Perform the Double-Check pattern... if (singleton_ == 0) @@ -174,7 +174,7 @@ template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton <TYPE, ACE_LOCK> * ACE_TSS_Singleton<TYPE, ACE_LOCK>::singleton_ = 0; // Lock the creation of the singleton. -template <class TYPE, class ACE_LOCK> LOCK +template <class TYPE, class ACE_LOCK> ACE_LOCK ACE_TSS_Singleton<TYPE, ACE_LOCK>::ace_singleton_lock_; #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ |