ChangeLogTag:Tue Dec 21 17:29:02 1999 Ossama Othman <othman@cs.wustl.edu>

17 files changed, 52 insertions, 48 deletions

diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 12d5e90c231..273021df33d 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -64,10 +64,10 @@ TAO_Internal::open_services (int &argc,
       // name of the shared library that implements the protocol.
       ACE_Service_Config::static_svcs ()->
         insert (&ace_svc_desc_TAO_IIOP_Protocol_Factory);
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
       ACE_Service_Config::static_svcs ()->
         insert (&ace_svc_desc_TAO_UIOP_Protocol_Factory);
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
       // add descriptor to list of static objects.
 
       int result = 0;
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
index edd50b31a82..4fcc42f7188 100644
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ b/TAO/tao/UIOP_Acceptor.cpp
@@ -19,7 +19,7 @@
 
 #include "tao/UIOP_Acceptor.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/UIOP_Profile.h"
 #include "tao/MProfile.h"
@@ -387,4 +387,4 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
     }
   return 0;
 }
-#endif  /* TAO_HAS_UIOP */
+#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
index aaacf65ed45..2a1145c6053 100644
--- a/TAO/tao/UIOP_Acceptor.h
+++ b/TAO/tao/UIOP_Acceptor.h
@@ -27,7 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 #include "ace/Acceptor.h"
 #include "ace/LSOCK_Acceptor.h"
@@ -105,6 +105,6 @@ private:
   // occurs.
 };
 
-# endif /* TAO_HAS_UIOP */
+# endif /* TAO_HAS_UIOP == 1 */
 
 #endif  /* TAO_UIOP_ACCEPTOR_H */
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index 66bed11894a..2426e603391 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/UIOP_Connect.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/UIOP_Transport.h"
 #include "tao/GIOP.h"
@@ -483,4 +483,4 @@ TAO_UIOP_Client_Connection_Handler::handle_cleanup (void)
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
index 231268ea81a..9a6f8f4ef0c 100644
--- a/TAO/tao/UIOP_Connect.h
+++ b/TAO/tao/UIOP_Connect.h
@@ -19,7 +19,7 @@
 
 #include "tao/UIOP_Transport.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -175,6 +175,6 @@ protected:
 #include "tao/UIOP_Connect.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
 
 #endif /* TAO_UIOP_CONNECT_H */
diff --git a/TAO/tao/UIOP_Connect.i b/TAO/tao/UIOP_Connect.i
index 5747a3bb451..a609f80ae7c 100644
--- a/TAO/tao/UIOP_Connect.i
+++ b/TAO/tao/UIOP_Connect.i
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 ACE_INLINE TAO_Transport *
 TAO_UIOP_Server_Connection_Handler::transport (void)
@@ -15,4 +15,4 @@ TAO_UIOP_Client_Connection_Handler::transport (void)
   return &(this->transport_);
 }
 
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index 2547f38ba05..0be764a1d60 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/UIOP_Connector.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/UIOP_Profile.h"
 #include "tao/GIOP.h"
@@ -690,4 +690,4 @@ TAO_UIOP_Connector::object_key_delimiter (void) const
   return TAO_UIOP_Profile::object_key_delimiter_;
 }
 
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
index 746404a50dc..06f4ff8ddaa 100644
--- a/TAO/tao/UIOP_Connector.h
+++ b/TAO/tao/UIOP_Connector.h
@@ -27,7 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 #include "ace/Connector.h"
 #include "ace/LSOCK_Connector.h"
@@ -203,6 +203,6 @@ private:
 
 };
 
-# endif  /* TAO_HAS_UIOP */
+# endif  /* TAO_HAS_UIOP == 1 */
 
 #endif  /* TAO_UIOP_CONNECTOR_H */
diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp
index e23426bb98c..09fc3875bed 100644
--- a/TAO/tao/UIOP_Factory.cpp
+++ b/TAO/tao/UIOP_Factory.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/UIOP_Factory.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/UIOP_Acceptor.h"
 #include "tao/UIOP_Connector.h"
@@ -90,4 +90,4 @@ ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory,
 ACE_FACTORY_DEFINE (TAO, TAO_UIOP_Protocol_Factory)
 
 
-#endif  /* TAO_HAS_UIOP */
+#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h
index ea747a96c25..aa79e57a1af 100644
--- a/TAO/tao/UIOP_Factory.h
+++ b/TAO/tao/UIOP_Factory.h
@@ -19,7 +19,7 @@
 
 #include "tao/Protocol_Factory.h"
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -64,6 +64,6 @@ private:
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_UIOP_Protocol_Factory)
 
-# endif  /* TAO_HAS_UIOP */
+# endif  /* TAO_HAS_UIOP == 1 */
 
 #endif /* TAO_UIOP_FACTORY_H */
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
index 4d829703b64..4391e4e84f2 100644
--- a/TAO/tao/UIOP_Profile.cpp
+++ b/TAO/tao/UIOP_Profile.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/UIOP_Profile.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/GIOP.h"
 #include "tao/CDR.h"
@@ -393,4 +393,4 @@ TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
   return 1;
 }
 
-#endif  /* TAO_HAS_UIOP */
+#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
index bc544b28f00..9a4c1749a5a 100644
--- a/TAO/tao/UIOP_Profile.h
+++ b/TAO/tao/UIOP_Profile.h
@@ -27,7 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 #include "tao/Object_KeyC.h"
 #include "tao/UIOP_Connect.h"
@@ -164,6 +164,6 @@ private:
 # include "tao/UIOP_Profile.i"
 #endif /* __ACE_INLINE__ */
 
-# endif  /* TAO_HAS_UIOP */
+# endif  /* TAO_HAS_UIOP == 1 */
 
 #endif  /* TAO_UIOP_PROFILE_H */
diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i
index 6c6f41c1fd2..04e3cb9859c 100644
--- a/TAO/tao/UIOP_Profile.i
+++ b/TAO/tao/UIOP_Profile.i
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 ACE_INLINE const TAO_ObjectKey &
 TAO_UIOP_Profile::object_key (void) const
@@ -52,4 +52,4 @@ TAO_UIOP_Profile::hint (void)
   return this->hint_;
 }
 
-#endif  /* TAO_HAS_UIOP */
+#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 564d929ed85..16cf87e0ca4 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/UIOP_Transport.h"
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
 
 #include "tao/UIOP_Connect.h"
 #include "tao/UIOP_Profile.h"
@@ -382,4 +382,4 @@ TAO_UIOP_Transport::send_request (TAO_Stub *,
   return -1;
 }
 
-#endif  /* TAO_HAS_UIOP */
+#endif  /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index f5eecddd0e0..b3b65399cf2 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -29,7 +29,7 @@
 
 #include "tao/GIOP.h"
 
-# if defined (TAO_HAS_UIOP)
+# if TAO_HAS_UIOP == 1
 
 // Forward decls.
 class TAO_UIOP_Handler_Base;
@@ -169,6 +169,6 @@ public:
   // non-blocking reads, fragment reassembly, etc.
 };
 
-# endif  /* TAO_HAS_UIOP */
+# endif  /* TAO_HAS_UIOP == 1 */
 
 #endif  /* TAO_UIOP_TRANSPORT_H */
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 511b7a366ee..f9268453237 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -383,7 +383,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
                       ASYS_TEXT ("TAO (%P|%t) Loaded default protocol <IIOP_Factory>\n")));
         }
 
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
       protocol_factory =
         ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("UIOP_Factory");
 
@@ -420,7 +420,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) Loaded default protocol <UIOP_Factory>\n"));
         }
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */
       return 0;
     }
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 5ad2e5147be..b54f346d3f5 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -356,12 +356,29 @@ enum MCAST_SERVICEID
 // OBV is in experimental stage
 #define TAO_HAS_VALUETYPE
 
-// UIOP support (GIOP over UNIX domain sockets)
-// #define TAO_HAS_UIOP
-
 // Minimum CORBA
 // #define TAO_HAS_MINIMUM_CORBA
 
+// UIOP support is enabled by default if the platform supports UNIX
+// domain sockets, and TAO is not configured for minimum CORBA.
+// If TAO is configured for minimum CORBA, then UIOP will be disabled
+// by default.
+// To explicitly enable UIOP support uncomment the following
+// #define TAO_HAS_UIOP 1
+// To explicitly disable UIOP support uncomment the following
+// #define TAO_HAS_UIOP 0
+
+// Default UIOP settings
+#if !defined (TAO_HAS_UIOP)
+#  if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+#    define TAO_HAS_UIOP 0
+#  elif defined (TAO_HAS_MINIMUM_CORBA)
+#    define TAO_HAS_UIOP 0
+#  else
+#    define TAO_HAS_UIOP 1
+#  endif  /* TAO_HAS_MINIMUM_CORBA */
+#endif  /* !TAO_HAS_UIOP */
+
 // INTERFACE_REPOSITORY
 //#define TAO_HAS_INTERFACE_REPOSITORY
 // Without Minimum CORBA, the user will get regular (no locality
@@ -406,19 +423,6 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
 #  define TAO_HAS_RT_CORBA
 #endif /* !TAO_HAS_RT_CORBA && !TAO_HAS_MINIMUM_CORBA */
 
-// If the user has not already specified TAO_HAS_UIOP, and the
-// platform supports UNIX domain sockets, and minimum CORBA is not
-// defined, we turn on TAO_HAS_UIOP by default.  Note that even with
-// minimum CORBA, the user can still get UIOP support simply be
-// defining TAO_HAS_UIOP before reaching this code.
-#if !defined (TAO_HAS_UIOP) && \
-    !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && \
-    !defined (TAO_HAS_MINIMUM_CORBA)
-#    define TAO_HAS_UIOP
-#endif /* !TAO_HAS_UIOP &&
-          !ACE_LACKS_UNIX_DOMAIN_SOCKETS &&
-          !TAO_HAS_MINIMUM_CORBA */
-
 // Policies are not locality constraint by default.
 #if !defined (TAO_HAS_REMOTE_POLICIES)
 # define TAO_HAS_REMOTE_POLICIES 1