summaryrefslogtreecommitdiff
path: root/TAO/tao/orbconf.h
diff options
context:
space:
mode:
authorkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-14 19:33:47 +0000
committerkirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-14 19:33:47 +0000
commit0992355f5b81baf1e79aaef0234d4af041ca12c7 (patch)
tree0ef34d63f1d6ea0d6cb7080c956cf77ea82fa693 /TAO/tao/orbconf.h
parentb3c4b5f65939f37492af8c8bf60360e6e944492b (diff)
downloadATCD-0992355f5b81baf1e79aaef0234d4af041ca12c7.tar.gz
Moved MINIMUM_CONNECTION_CACHING_STRATEGY to after MINIMUM_CORBA was
defined
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r--TAO/tao/orbconf.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 36dd69371ab..2e5692e94e8 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -169,23 +169,6 @@
# define TAO_PURGE_PERCENT 20
#endif /* TAO_PURGE_PERCENT */
-// MINIMUM_CONNECTION_CACHING_STRATEGY support is disabled by default if TAO is not
-// configured for minimum CORBA. If TAO is configured for minimum
-// CORBA, then MINIMUM_CONNECTION_CACHING_STRATEGY will be enabled by default.
-// To explicitly enable MINIMUM_CONNECTION_CACHING_STRATEGY support uncomment the following
-// #define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 1
-// To explicitly disable MINIMUM_CONNECTION_CACHING_STRATEGY support uncomment the following
-// #define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 0
-
-// Default MINIMUM_CONNECTION_CACHING_STRATEGY settings
-#if !defined (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY)
-# if (TAO_HAS_MINIMUM_CORBA == 1)
-# define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 1
-# else
-# define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 0
-# endif /* TAO_HAS_MINIMUM_CORBA */
-#endif /* !TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY */
-
// This deals with platforms that support namespaces vs platforms that
// don't. @@ MSVC's namespace implementation is somehow broken.
// The following macros are required to deal with the most bizarre and insane
@@ -814,6 +797,23 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
# endif /* TAO_HAS_MINIMUM_CORBA */
#endif
+// MINIMUM_CONNECTION_CACHING_STRATEGY support is disabled by default if TAO is not
+// configured for minimum CORBA. If TAO is configured for minimum
+// CORBA, then MINIMUM_CONNECTION_CACHING_STRATEGY will be enabled by default.
+// To explicitly enable MINIMUM_CONNECTION_CACHING_STRATEGY support uncomment the following
+// #define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 1
+// To explicitly disable MINIMUM_CONNECTION_CACHING_STRATEGY support uncomment the following
+// #define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 0
+
+// Default MINIMUM_CONNECTION_CACHING_STRATEGY settings
+#if !defined (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY)
+# if (TAO_HAS_MINIMUM_CORBA == 1)
+# define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 1
+# else
+# define TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY 0
+# endif /* TAO_HAS_MINIMUM_CORBA */
+#endif /* !TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY */
+
// Define the policy types as literals, so they can be used in switch
// statements