summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-07-23 12:47:35 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-07-23 12:47:35 +0000
commit99256ec5fb4be767a05e9e6d4257ccafc6f891d7 (patch)
tree7c9efcbf5c677160b21cef895882c3cf46a745d3
parentadc53202b3afb4175c3bdb1369f388e04ce8fb05 (diff)
downloadATCD-99256ec5fb4be767a05e9e6d4257ccafc6f891d7.tar.gz
ChangeLogTag: Mon Jul 23 07:46:30 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a4
-rw-r--r--TAO/tao/orbconf.h11
2 files changed, 4 insertions, 11 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2588e5904b7..732c0b0ff09 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Mon Jul 23 07:46:30 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/orbconf.h: Enabled DIOP for minimum CORBA.
+
Sun Jul 22 21:53:23 2001 Irfan Pyarali <irfan@cs.wustl.edu>
* $ACE_ROOT/auto_run_tests.lst: Disabled Exposed_Policies test for
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index b43eabaf91b..12336939a76 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -444,20 +444,9 @@ enum MCAST_SERVICEID
# define TAO_HAS_MINIMUM_CORBA 0
#endif /* TAO_HAS_MINIMUM_CORBA */
-// If TAO is configured for minimum CORBA, then DIOP will be disabled
-// by default; otherwise it is enabled.
-// To explicitly enable DIOP support uncomment the following
-// #define TAO_HAS_DIOP 1
-// To explicitly disable DIOP support uncomment the following
-// #define TAO_HAS_DIOP 0
-
// Default DIOP settings
#if !defined (TAO_HAS_DIOP)
-# if (TAO_HAS_MINIMUM_CORBA == 0)
# define TAO_HAS_DIOP 1
-# else
-# define TAO_HAS_DIOP 0
-# endif /* TAO_HAS_MINIMUM_CORBA == 1 */
#endif /* !TAO_HAS_DIOP */