summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-28 22:00:39 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-28 22:00:39 +0000
commitc84694393f17bd26a4a54c37d0be8bc6a8b15fd8 (patch)
treeb1e599638a8bd0af0b47cd8fc2c308f322d93b06
parent1d4076dd1cf9d0b135e48cf0d84cbb0be3799a6c (diff)
downloadATCD-c84694393f17bd26a4a54c37d0be8bc6a8b15fd8.tar.gz
Don't use "namespace" with MSVC. It is broken.
-rw-r--r--TAO/tao/orbconf.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 2bac956dbc6..398f644ccd1 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -120,8 +120,9 @@
#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
// This deals with platforms that support namespaces vs platforms that
-// don't.
-#if defined (ACE_HAS_USING_KEYWORD)
+// don't. @@ MSVC's namespace implementation is somehow broken.
+// Statics sometime don't get initialized when using namespace.
+#if defined (ACE_HAS_USING_KEYWORD) || !defined (_MSC_VER)
#define TAO_NAMESPACE namespace
#else
#define TAO_NAMESPACE struct TAO_EXPORT_MACRO