summaryrefslogtreecommitdiff
path: root/TAO/tao/orbconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r--TAO/tao/orbconf.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 6f11bd03b26..3799499aa73 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -42,19 +42,19 @@
#define TAO_SOCK_CONNECTOR ACE_SOCK_CONNECTOR
#endif /* TAO_SOCK_CONNECTOR */
-// The default arguments of the resource factory for the fake service
+// The default arguments of the resource factory for the fake service
// configurator
#if !defined (TAO_DEFAULT_RESOURCE_FACTORY_ARGS)
#define TAO_DEFAULT_RESOURCE_FACTORY_ARGS { "-ORBresources", "tss" }
#endif /* TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
-// The default arguments of the client strategy factory for the fake service
+// The default arguments of the client strategy factory for the fake service
// configurator
#if !defined (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS)
#define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS { 0 }
#endif /* TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS */
-// The default arguments of the server strategy factory for the fake service
+// The default arguments of the server strategy factory for the fake service
// configurator
#if !defined (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS)
#define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS { "-ORBconcurrency", "reactive", \
@@ -113,6 +113,13 @@
# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
+// This deals with platforms that support namespaces vs platforms that don't.
+#if defined (ACE_HAS_USING_KEYWORD)
+#define TAO_NAMESPACE namespace
+#else
+#define TAO_NAMESPACE struct
+#endif
+
//
// In some environments it is useful to swap the bytes on write, for
// instance: a fast server can be feeding a lot of slow clients that