ChangeLogTag: Wed Jan 5 19:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 5 insertions, 21 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 34c342ad7a0..719c823ec3c 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -1252,10 +1252,7 @@ nobase_include_HEADERS += \
   PortableGroup/PG_Location_Hash.inl \
   PortableGroup/PG_Properties_Encoder.inl \
   PortableGroup/UIPMC_Acceptor.i \
-  PortableGroup/UIPMC_Connection_Handler.i \
   PortableGroup/UIPMC_Endpoint.i \
-  PortableGroup/UIPMC_Profile.i \
-  PortableGroup/UIPMC_Transport.i \
   PortableGroupC.inl \
   PortableGroupS.inl \
   PortableGroupS_T.inl \
@@ -5272,7 +5269,6 @@ nobase_include_HEADERS += \
   SSLIOP/SSLIOP_Current.inl \
   SSLIOP/SSLIOP_Current_Impl.inl \
   SSLIOP/SSLIOP_Endpoint.i \
-  SSLIOP/SSLIOP_Profile.i \
   SSLIOP/ssl_endpoints.i \
   SSLIOPC.inl \
   SSLIOPS.inl \
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 6a203a8813b..024be8f4f84 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -9,11 +9,6 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Profile,
            "$Id$")
 
-
-#if !defined (__ACE_INLINE__)
-# include "SSLIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
                                const TAO::ObjectKey & object_key,
                                const TAO_GIOP_Message_Version & version,
@@ -344,11 +339,11 @@ TAO_SSLIOP_Profile::parse_string (const char * ior
    ACE_CHECK;
 
    this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
-   
-   if( ssl_only_) 
+
+   if( ssl_only_)
    {
       this->ssl_endpoint_.ssl_component_.port = this->endpoint_.port_;
-      
+
       // Note that the Security::NoProtection bit is cleared since we
       // are sure the server supports SSL (we're told so)
       ACE_CLR_BITS (this->ssl_endpoint_.ssl_component_.target_supports,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 7d90d00f290..6dab11bcab0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -155,7 +155,7 @@
        * rest of the SSL endpoint list is transmitted.
        */
       TAO_SSLIOP_Endpoint ssl_endpoint_;
-      
+
       /**
        * Allways treat this endpoint as secure, even if the constructor
        * did not explicitely specify a tagged component for SSL.
@@ -164,17 +164,13 @@
        * attributes - port number, for instance.
        */
       int ssl_only_;
-      
+
     };
 
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
 
-#if defined (__ACE_INLINE__)
-# include "SSLIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_SSLIOP_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i
deleted file mode 100644
index 2ad999ebb73..00000000000
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$