summaryrefslogtreecommitdiff
path: root/ace/Local_Tokens.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Local_Tokens.h')
-rw-r--r--ace/Local_Tokens.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 6e68856d02e..4ed2c1222a0 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
//=============================================================================
/**
@@ -67,6 +67,8 @@
# define ACE_NO_TSS_TOKENS 1
#endif /* !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
// 1.
/**
* @class ACE_TOKEN_CONST
@@ -77,9 +79,8 @@
* this class is necessary to fight the compiler with order of
* declaration errors.
*/
-class ACE_Export ACE_TOKEN_CONST
+namespace ACE_TOKEN_CONST
{
-public:
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
// ACE platform supports some form of threading.
typedef ACE_Condition_Thread_Mutex COND_VAR;
@@ -90,7 +91,7 @@ public:
typedef ACE_Null_Mutex MUTEX;
typedef ACE_Guard<ACE_Null_Mutex> GUARD;
#endif /* ACE_HAS_THREADS */
-};
+}
// Forward decl.
class ACE_Token_Proxy;
@@ -105,7 +106,7 @@ class ACE_Token_Proxy;
*/
class ACE_Export ACE_TPQ_Entry
{
-friend class ACE_Token_Manager;
+ friend class ACE_Token_Manager;
public:
typedef void (*PTVF) (void *);
@@ -1109,6 +1110,8 @@ protected:
ACE_Tokens *create_token (const ACE_TCHAR *name);
};
+ACE_END_VERSIONED_NAMESPACE_DECL
+
#endif /* ACE_HAS_TOKENS_LIBRARY */
#if defined (__ACE_INLINE__)