summaryrefslogtreecommitdiff
path: root/TAO/tao/UIOP_Connector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/UIOP_Connector.cpp')
-rw-r--r--TAO/tao/UIOP_Connector.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index 0ef939813a6..575446b2ca8 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -1,8 +1,9 @@
+// This may look like C, but it's really -*- C++ -*-
// $Id$
#include "tao/UIOP_Connector.h"
-#if defined (TAO_HAS_UIOP)
+#if TAO_HAS_UIOP == 1
#include "tao/UIOP_Profile.h"
#include "tao/debug.h"
@@ -10,8 +11,10 @@
#include "tao/Environment.h"
#include "ace/Auto_Ptr.h"
+
ACE_RCSID(tao, UIOP_Connector, "$Id$")
+
#if defined (TAO_USES_ROBUST_CONNECTION_MGMT)
int
TAO_UIOP_Connector::purge_connections (void)
@@ -223,8 +226,8 @@ template class ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_C
#pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_UNIX_Addr>
#if !defined (TAO_USES_ROBUST_CONNECTION_MGMT)
-#pragma instantiate CACHED_CONNECT_STRATEGY;
-#pragma instantiate TAO_ADDR;
+#pragma instantiate CACHED_CONNECT_STRATEGY
+#pragma instantiate TAO_ADDR
#endif /* TAO_USES_ROBUST_CONNECTION_MGMT */
#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
@@ -685,7 +688,7 @@ TAO_UIOP_Connector::check_prefix (const char *endpoint)
char
TAO_UIOP_Connector::object_key_delimiter (void) const
{
- return TAO_UIOP_Profile::object_key_delimiter;
+ return TAO_UIOP_Profile::object_key_delimiter_;
}
-#endif /* TAO_HAS_UIOP */
+#endif /* TAO_HAS_UIOP == 1 */