summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-29 21:20:33 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-29 21:20:33 +0000
commitbd1e08bbc63fd77d79a03e7787fbb045be70e237 (patch)
tree6915aeadb20310031486b5eadc2cf34fc584abec
parentc3119f687bcbe71f053a89638008fa0eb7ecf849 (diff)
downloadATCD-bd1e08bbc63fd77d79a03e7787fbb045be70e237.tar.gz
*** empty log message ***
-rw-r--r--TAO/tao/orbconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 6963fdd858b..640164972df 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -122,7 +122,7 @@
// This deals with platforms that support namespaces vs platforms that
// don't. @@ MSVC's namespace implementation is somehow broken.
// Statics sometime don't get initialized when using namespace.
-#if defined (ACE_HAS_USING_KEYWORD)
+#if defined (ACE_HAS_USING_KEYWORD) && !defined (_MSC_VER)
#define TAO_NAMESPACE namespace
#else
#define TAO_NAMESPACE struct TAO_EXPORT_MACRO