diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 857d57abeb0..7f6d496f1f7 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Feb 17 12:44:30 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/orbconf.h: Disabled SHMIOP for the upcoming beta. SHMIOP + does not work with the single read optimizations that have been + integrated in to TAO. This will be enabled after the beta when + we have a work around. + + Fri Sat 17 11:49:29 2001 Pradeep Gore <pradeep@cs.wustl.edu> * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp: diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index f1c7d95aa93..3b57e636e79 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -462,7 +462,15 @@ enum MCAST_SERVICEID #endif /* !TAO_HAS_UIOP */ #if !defined (TAO_HAS_SHMIOP) -# define TAO_HAS_SHMIOP 1 +# 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 #endif /* TAO_HAS_SHMIOP */ // RT_CORBA support is enabled by default if TAO is not configured for |