summaryrefslogtreecommitdiff
path: root/TAO/tao/orbconf.h
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-02-19 18:30:14 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-02-19 18:30:14 +0000
commited941aa8ab75903dac527876039486f3df548a84 (patch)
tree4ba8930b1c96ac33c17bab9ae6d7e1a7e70ee068 /TAO/tao/orbconf.h
parent490d83557d93ed769cb6e6699ac673bb33bc7b86 (diff)
downloadATCD-ed941aa8ab75903dac527876039486f3df548a84.tar.gz
ChangeLogTag: Mon Feb 19 12:11:23 2001 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r--TAO/tao/orbconf.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 3b57e636e79..f1c7d95aa93 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -462,15 +462,7 @@ enum MCAST_SERVICEID
#endif /* !TAO_HAS_UIOP */
#if !defined (TAO_HAS_SHMIOP)
-# define TAO_HAS_SHMIOP 0
-#endif /* TAO_HAS_SHMIOP */
-
-// If by any chance we have TAO_HAS_SHMIOP defined by the user, we
-// still want to disable SHMIOP for TAO 1.1.13 as we have a small
-// problem with SHMIOP for this beta. We need to remove this after the
-// beta -- Bala
-#if defined (TAO_HAS_SHMIOP)
-# define TAO_HAS_SHMIOP 0
+# define TAO_HAS_SHMIOP 1
#endif /* TAO_HAS_SHMIOP */
// RT_CORBA support is enabled by default if TAO is not configured for