ChangeLogTag: Wed Dec 20 20:59:39 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

4 files changed, 4 insertions, 52 deletions

diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index c20e43fd34a..c96007e7c2e 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -34,49 +34,7 @@ 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;
-//     }
-
-
     /// dtor
-
     Current_Loader::~Current_Loader (void)
     {
     }
@@ -84,7 +42,6 @@ namespace TAO
 
 
     /// Initializes object when dynamic linking occurs.
-
     int
     Current_Loader::init (int, ACE_TCHAR *[])
     {
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index d31a8a624ad..ef01b20ff73 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -40,12 +40,6 @@ namespace TAO
     {
     public:
 
-//       /// A helper method for obtaining access to the the Transport
-//       /// Factory Manager instance.
-//       static Current_Loader* instance (void);
-
-    public:
-
       /// Initializes object when dynamic linking occurs.
       virtual int init (int argc, ACE_TCHAR *argv[]);
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index 084d6cf6c10..05c7d100dd3 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -3,6 +3,7 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/TransportCurrent/Current_ORBInitializer_Base.h"
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -71,5 +72,3 @@ namespace TAO
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 649cb6258ed..435a54eab6a 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -54,7 +54,9 @@ namespace TAO
     IIOP_Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
-      return this->handler ()->get_handle ();
+      // Need to use cast to pacify windows compilers complaining
+      // about the implicit HANDLE -> CORBA::Long conversion.
+      return (CORBA::Long) this->handler ()->get_handle ();
     }
 
     ::SSLIOP::Current_ptr