ChangeLogTag: Wed Dec 20 16:22:29 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

4 files changed, 62 insertions, 44 deletions

diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index 04210f9ba21..c20e43fd34a 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -34,45 +34,45 @@ namespace TAO
   namespace Transport
   {
 
-    /// A helper method for obtaining access to the the Transport
-    /// Factory Manager instance.
-
-    Current_Loader*
-    Current_Loader::instance (void)
-    {
-      Current_Loader *cl =
-        ACE_Dynamic_Service <Current_Loader>::instance (ACE_TEXT ("TAO_Transport_Current_Loader"));
-
-      if (cl == 0)
-#if defined (TAO_AS_STATIC_LIBS)
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")),
-                              0);
-          return 0;
-        }
-#else
-      {
-        // In case we build shared, try to load the appropriate library.
-        ACE_Service_Config::process_directive
-          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
-                                         "TAO_TC",
-                                         "_make_TAO_Transport_Current_Loader",
-                                         ""));
-        cl = ACE_Dynamic_Service<Current_Loader>::instance (ACE_TEXT ("TAO_Transport_Current_Loader"));
-      }
-#endif /* TAO_AS_STATIC_LIBS */
-
-      if (cl != 0)
-        return cl;
-
-      if (TAO_debug_level > 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")),
-                          0);
-      return 0;
-    }
+//     /// A helper method for obtaining access to the the Transport
+//     /// Factory Manager instance.
+
+//     Current_Loader*
+//     Current_Loader::instance (void)
+//     {
+//       Current_Loader *cl =
+//         ACE_Dynamic_Service <Current_Loader>::instance (ACE_TEXT ("TAO_Transport_Current_Loader"));
+
+//       if (cl == 0)
+// #if defined (TAO_AS_STATIC_LIBS)
+//         {
+//           if (TAO_debug_level > 0)
+//             ACE_ERROR_RETURN ((LM_ERROR,
+//                                ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")),
+//                               0);
+//           return 0;
+//         }
+// #else
+//       {
+//         // In case we build shared, try to load the appropriate library.
+//         ACE_Service_Config::process_directive
+//           (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
+//                                          "TAO_TC",
+//                                          "_make_TAO_Transport_Current_Loader",
+//                                          ""));
+//         cl = ACE_Dynamic_Service<Current_Loader>::instance (ACE_TEXT ("TAO_Transport_Current_Loader"));
+//       }
+// #endif /* TAO_AS_STATIC_LIBS */
+
+//       if (cl != 0)
+//         return cl;
+
+//       if (TAO_debug_level > 0)
+//         ACE_ERROR_RETURN ((LM_ERROR,
+//                            ACE_TEXT ("(%P|%t) Unable to obtain Current::Loader instance: %m\n")),
+//                           0);
+//       return 0;
+//     }
 
 
     /// dtor
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index bab40b4f003..d31a8a624ad 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -21,6 +21,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Object.h"
+#include "ace/Service_Config.h"
 #include "tao/Versioned_Namespace.h"
 #include "tao/TransportCurrent/Transport_Current_Export.h"
 
@@ -39,9 +40,9 @@ namespace TAO
     {
     public:
 
-      /// A helper method for obtaining access to the the Transport
-      /// Factory Manager instance.
-      static Current_Loader* instance (void);
+//       /// A helper method for obtaining access to the the Transport
+//       /// Factory Manager instance.
+//       static Current_Loader* instance (void);
 
     public:
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index b17da2f1a57..623cd2ed29d 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -55,13 +55,27 @@ namespace TAO
 
         return 0;
       }
+
+      Current_Loader::Current_Loader ()
+      {
+      }
+
+      Current_Loader::~Current_Loader ()
+      {
+      }
+
     }
 
   }
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 
 #if defined (TAO_AS_STATIC_LIBS)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader);
 
 namespace TAO
@@ -77,12 +91,13 @@ namespace TAO
       }
     }
   }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 }
 #endif /* defined (TAO_AS_STATIC_LIBS) */
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader,
                        ACE_TEXT ("TAO_Transport_IIOP_Current_Loader"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
index 7f49533fa03..2199de74781 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
@@ -35,6 +35,8 @@ namespace TAO
       public:
         /// Initializes object when dynamic linking occurs.
         virtual int init (int argc, ACE_TCHAR *argv[]);
+        virtual ~Current_Loader ();
+        Current_Loader ();
       };
     }
   }