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

27 files changed, 8 insertions, 96 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4d5a8419a0e..75bd59e894b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan  5 19:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.{h,cpp,i,inl}:
+          Removed i/inl file, update h/cpp
+
+        * orbsvcs/orbsvcs/Makefile.am
+          Updated for change above
+
 Wed Jan  5 19:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.{h,cpp,i}:
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
index 385358f7630..8f22da485d4 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
@@ -23,15 +23,10 @@
 
 #include "ace/Object_Manager.h"
 
-#if !defined(__ACE_INLINE__)
-#include "HTIOP_Acceptor_Impl.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(HTIOP,
           TAO_HTIOP_Acceptor_Impl,
           "$Id$")
 
-
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER>
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index d594ab41cb9..ca5eb903363 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -16,11 +16,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Acceptor_Impl.h"
 
-#if !defined (__ACE_INLINE__)
-# include "HTIOP_Completion_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (HTIOP,
            TAO_HTIOP_Completion_Handler,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
index ced980f8324..4fce97d6a85 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -91,9 +91,5 @@ namespace TAO
   }
 }
 
-#if defined (__ACE_INLINE__)
-#include "HTIOP_Completion_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* HTIOP_COMPLETION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index c2ea31312ec..f683324febc 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -21,11 +21,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-#if !defined (__ACE_INLINE__)
-# include "HTIOP_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (HTIOP,
            TAO_HTIOP_Connection_Handler,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
index daa12b9f6ea..76ca95eb810 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -127,9 +127,5 @@ namespace TAO
     };
   }
 }
-#if defined (__ACE_INLINE__)
-#include "HTIOP_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* HTIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.i
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
index 72fd664a041..39d8aa62734 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -109,10 +109,6 @@ namespace TAO
   }
 }
 
-#if defined(__ACE_INLINE__)
-#include "HTIOP_Connector_Impl.i"
-#endif /* __ACE_INLINE__ */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "HTIOP_Connector_Impl.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index b82ab39c045..7a7b5ffe167 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -11,16 +11,11 @@
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
-//#include "tao/iiop_endpoints.h"
 
 ACE_RCSID(HTIOP,
           TAO_HTIOP_Profile,
           "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "HTIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "htiop";
 
 const char TAO::HTIOP::Profile::object_key_delimiter_ = '/';
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index cfea2764e8e..e8556b345d2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -143,9 +143,5 @@ namespace TAO
   }
 }
 
-#if defined (__ACE_INLINE__)
-# include "HTIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* HTIOP_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index e6e76efb217..498b351951d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -24,12 +24,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Adapter.h"
 
-
-#if !defined (__ACE_INLINE__)
-# include "HTIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (HTIOP,
            TAO_HTIOP_Transport,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 613f1c5c24a..209622ac41a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -161,9 +161,5 @@ namespace TAO
   }
 }
 
-#if defined (__ACE_INLINE__)
-#include "HTIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 05c563439c4..34c342ad7a0 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -4081,13 +4081,7 @@ nobase_include_HEADERS += \
   HTIOPS.h \
   HTIOPS_T.h \
   HTIOP/HTIOP_Acceptor.i \
-  HTIOP/HTIOP_Acceptor_Impl.i \
-  HTIOP/HTIOP_Completion_Handler.i \
-  HTIOP/HTIOP_Connection_Handler.i \
-  HTIOP/HTIOP_Connector_Impl.i \
   HTIOP/HTIOP_Endpoint.i \
-  HTIOP/HTIOP_Profile.i \
-  HTIOP/HTIOP_Transport.i \
   HTIOP/htiop_endpointsC.inl \
   HTIOPC.inl \
   HTIOPS.inl \
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 987f574ee80..3b4dfdfdabc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -19,10 +19,6 @@
 #include "UIPMC_Transport.h"
 #include "UIPMC_Endpoint.h"
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
 ACE_RCSID(tao, UIPMC_Connect, "$Id$")
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
index c388a08279c..36906b9aa17 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h
@@ -144,10 +144,5 @@ protected:
 
 };
 
-
-#if defined (__ACE_INLINE__)
-#include "UIPMC_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_UIPMC_CONNECTION_HANDLER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i
deleted file mode 100644
index 7f2b3228624..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index ecd5b159eff..1a1a00a680a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -19,10 +19,6 @@ ACE_RCSID (PortableGroup,
            UIPMC_Profile,
            "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char prefix_[] = "uipmc";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d36affa5d6a..e6c0bf96e39 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -153,9 +153,5 @@ private:
 
 };
 
-#if defined (__ACE_INLINE__)
-# include "UIPMC_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_PROFILE_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i
deleted file mode 100644
index c130d6682b1..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index bcdd093c8d8..29f73f0da8a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -22,11 +22,6 @@
 #include "tao/GIOP_Message_Base.h"
 #include "tao/GIOP_Message_Lite.h"
 
-#if !defined (__ACE_INLINE__)
-# include "UIPMC_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
-
 ACE_RCSID (PortableGroup,
            UIPMC_Transport,
            "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 945f6067706..975cb5fbf54 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -123,9 +123,5 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-#if defined (__ACE_INLINE__)
-#include "UIPMC_Transport.i"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_UIPMC_TRANSPORT_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$