Wed Sep 13 14:58:24 UTC 2006 Ciju John <johnc@ociweb.com>

        * tao/Transport_Connector.h:
        * tao/Transport_Connector.inl:
        * tao/Transport_Connector.cpp:
          The TransportCleanupGuard is for local usage, so am moving it
          into an anonymous namespace.

4 files changed, 47 insertions, 41 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 80bd78fb17a..096aa14ef36 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 13 14:58:24 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.inl:
+        * tao/Transport_Connector.cpp:
+          The TransportCleanupGuard class is for local usage, so am moving
+          it into an anonymous namespace.
+
 Fri Sep  8 20:03:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 6d6c85d9fb6..5f0613260e5 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -28,6 +28,45 @@ ACE_RCSID (tao,
            Connector,
            "$Id$")
 
+namespace
+{
+  class TransportCleanupGuard
+  {
+  public:
+
+    TransportCleanupGuard (TAO_Transport *tp, bool awake=false)
+      : tp_ (tp)
+      , awake_ (awake)
+    {
+    }
+
+    ~TransportCleanupGuard ()
+    {
+      if (this->awake_ && this->tp_)
+        {
+          // Purge from the connection cache.  If we are not in the
+          // cache, this does nothing.
+          this->tp_->purge_entry ();
+
+          // Close the handler.
+          this->tp_->close_connection ();
+
+          this->tp_->remove_reference ();
+        }
+    }
+
+    void awake ()
+    {
+      this->awake_ = true;
+    }
+
+  private:
+
+    TAO_Transport * const tp_;
+    bool awake_;
+
+  };
+};
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -764,27 +803,6 @@ TAO_Connector::check_connection_closure (
   return result;
 }
 
-TransportCleanupGuard::TransportCleanupGuard (TAO_Transport *tp
-                , bool awake)
-  : tp_ (tp)
-    , awake_ (awake)
-{}
-
-TransportCleanupGuard::~TransportCleanupGuard (void)
-{
-  if (awake_ && (tp_ != 0))
-    {
-      // Purge from the connection cache, if we are not in the cache, this
-      // just does nothing.
-      tp_->purge_entry ();
-
-      // Close the handler.
-      tp_->close_connection ();
-
-      tp_->remove_reference ();
-    }
-}
-
 //@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index af1f2942ea2..22a99ac0e47 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -231,21 +231,6 @@ private:
   //@@ TAO_CONNECTOR_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-
-class TransportCleanupGuard
-{
-private:
-  TAO_Transport *tp_;
-  bool awake_;
-
-public:
-  TransportCleanupGuard (TAO_Transport *tp, bool awake = false);
-
-  ~TransportCleanupGuard (void);
-
-  void awake ();
-};
-
 //@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl
index dee1ab44ce4..64683bc6a14 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -22,9 +22,4 @@ TAO_Connector::tag (void) const
   return this->tag_;
 }
 
-ACE_INLINE void
-TransportCleanupGuard::awake () {
-  awake_ = true;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL