summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2006-02-04 00:27:50 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2006-02-04 00:27:50 +0000
commit925d467ec553414c7a8cc19741681408898ca1b4 (patch)
treea09255f007b7ed1b0e4316e985a47234a52153d7
parentdc784cda040c530d5d307bdc126ac76f6935dd97 (diff)
downloadATCD-925d467ec553414c7a8cc19741681408898ca1b4.tar.gz
ChangeLogTag:Fri Feb 3 14:47:53 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
-rw-r--r--ChangeLog5
-rw-r--r--ace/Guard_T.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae411e5f213..fe0763eb68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Fri Feb 3 14:47:53 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
Added missing versioned namespace declarations.
+ * ace/Guard_T.h:
+
+ Fixed versioned namespace related errors in single-threaded
+ builds with that feature enabled.
+
* ace/WFMO_Reactor.h:
Forward declare the ACE_WFMO_Reactor_Test class outside of the
diff --git a/ace/Guard_T.h b/ace/Guard_T.h
index 2e64d9e5a66..763481da534 100644
--- a/ace/Guard_T.h
+++ b/ace/Guard_T.h
@@ -345,10 +345,10 @@ public:
// Declare the dynamic allocation hooks.
};
-ACE_END_VERSIONED_NAMESPACE_DECL
-
#endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
#include "ace/Guard_T.inl"
#endif /* __ACE_INLINE__ */