diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 20:17:03 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-04 20:17:03 +0000 |
commit | 194a1d596980a661abf10dea7d8846afb2558389 (patch) | |
tree | 3562daafd8c124aabfa2d5de2aaa25f68787b65f /TAO | |
parent | 919b2e8f27e15c6593e745d9db14d7f627712f69 (diff) | |
download | ATCD-194a1d596980a661abf10dea7d8846afb2558389.tar.gz |
ChangeLogTag: Tue Jan 4 20:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
46 files changed, 29 insertions, 187 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d84a0a4594e..c7e5209c1bd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,29 @@ +Tue Jan 4 20:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Strategies/DIOP_Connection_Handler.{h,cpp,i}: + * tao/Strategies/DIOP_Profile.{h,cpp,i}: + * tao/Strategies/DIOP_Transport.{h,cpp,i}: + * tao/Strategies/SCIOP_Connection_Handler.{h,cpp,i}: + * tao/Strategies/SCIOP_Profile.{h,cpp,i}: + * tao/Strategies/SCIOP_Transport.{h,cpp,i}: + * tao/Strategies/SHMIOP_Acceptor.{h,cpp,i}: + * tao/Strategies/SHMIOP_Connection_Handler.{h,cpp,inl}: + * tao/Strategies/SHMIOP_Profile.{h,cpp,i}: + * tao/Strategies/SHMIOP_Transport.{h,cpp,i}: + * tao/Strategies/UIOP_Connection_Handler.{h,cpp,inl}: + * tao/Strategies/UIOP_Endpoint.cpp + * tao/Strategies/UIOP_Endpoint.h + * tao/Strategies/UIOP_Profile.{h,cpp,i}: + * tao/Strategies/UIOP_Transport.{h,cpp,i}: + * tao/Strategies/advanced_resource.{h,cpp,i}: + All .i/.inl files above where empty, so removed them from the repo + and updated the h/cpp files to not include the removed file. In case + someone want to inline a method, must re-add the file at that moment + with the .inl extension + + * tao/Makefile.am + Updated for changes above + Tue Jan 4 19:53:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/BiDir_GIOP/BiDirPolicyC.{h,cpp,i,inl}: diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 7d62715b387..351fd92fda8 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1995,26 +1995,11 @@ nobase_include_HEADERS += \ Strategies/strategies_export.h \ Strategies/uiop_endpoints.h \ Strategies/DIOP_Acceptor.i \ - Strategies/DIOP_Connection_Handler.i \ Strategies/DIOP_Endpoint.i \ - Strategies/DIOP_Profile.i \ - Strategies/DIOP_Transport.i \ Strategies/LF_Strategy_Null.inl \ Strategies/SCIOP_Acceptor.i \ - Strategies/SCIOP_Connection_Handler.i \ Strategies/SCIOP_Endpoint.i \ - Strategies/SCIOP_Profile.i \ - Strategies/SCIOP_Transport.i \ - Strategies/SHMIOP_Acceptor.i \ - Strategies/SHMIOP_Connection_Handler.inl \ Strategies/SHMIOP_Endpoint.i \ - Strategies/SHMIOP_Profile.i \ - Strategies/SHMIOP_Transport.i \ - Strategies/UIOP_Connection_Handler.inl \ - Strategies/UIOP_Endpoint.i \ - Strategies/UIOP_Profile.i \ - Strategies/UIOP_Transport.i \ - Strategies/advanced_resource.i \ Strategies/sciop_endpoints.i \ Strategies/uiop_endpoints.i \ Strategies/sciop_endpoints.pidl \ diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 8bddb4af377..c768a46dc58 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -19,10 +19,6 @@ #include "DIOP_Transport.h" #include "DIOP_Endpoint.h" -#if !defined (__ACE_INLINE__) -# include "DIOP_Connection_Handler.i" -#endif /* ! __ACE_INLINE__ */ - #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index ea8de503f81..933a1f4254d 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -57,7 +57,7 @@ public: TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0); - /// Constructor. + /// Constructor. TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag); @@ -129,7 +129,7 @@ public: /// Set Diff-Serv codepoint on outgoing packets. int set_dscp_codepoint (CORBA::Boolean set_network_priority); - + protected: //@{ @@ -160,10 +160,6 @@ private: int dscp_codepoint_; }; -#if defined (__ACE_INLINE__) -#include "DIOP_Connection_Handler.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.i b/TAO/tao/Strategies/DIOP_Connection_Handler.i deleted file mode 100644 index 7f2b3228624..00000000000 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.i +++ /dev/null @@ -1,3 +0,0 @@ -// -*- C++ -*- -// $Id$ - diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i index 1297351cf13..3bd443220b5 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.i +++ b/TAO/tao/Strategies/DIOP_Endpoint.i @@ -1,8 +1,6 @@ // -*- C++ -*- // $Id$ - - ACE_INLINE const char * TAO_DIOP_Endpoint::host (void) const { diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 44d469172ce..e301e3b3aa1 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -16,16 +16,10 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/os_netdb.h" - ACE_RCSID (Strategies, DIOP_Profile, "$Id$") - -#if !defined (__ACE_INLINE__) -# include "DIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - static const char prefix_[] = "diop"; const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index e9adca53cbe..e51bb10e95f 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -122,10 +122,6 @@ protected: CORBA::ULong count_; }; -#if defined (__ACE_INLINE__) -# include "DIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Profile.i b/TAO/tao/Strategies/DIOP_Profile.i deleted file mode 100644 index c130d6682b1..00000000000 --- a/TAO/tao/Strategies/DIOP_Profile.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index b52f03de14c..ed8b55bf661 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -22,10 +22,6 @@ #include "tao/GIOP_Message_Base.h" #include "tao/GIOP_Message_Lite.h" -#if !defined (__ACE_INLINE__) -# include "DIOP_Transport.i" -#endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, DIOP_Transport, "$Id$") TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 423b23a9317..63c79700296 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -135,10 +135,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -#if defined (__ACE_INLINE__) -#include "DIOP_Transport.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Transport.i b/TAO/tao/Strategies/DIOP_Transport.i deleted file mode 100644 index 81bf354f364..00000000000 --- a/TAO/tao/Strategies/DIOP_Transport.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -//$Id$ diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index f439eaa4cfe..f1a4ea66cbb 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -28,16 +28,10 @@ #include "tao/Protocols_Hooks.h" #include "tao/Wait_Strategy.h" -#if !defined (__ACE_INLINE__) -# include "SCIOP_Connection_Handler.i" -#endif /* ! __ACE_INLINE__ */ - - ACE_RCSID (tao, SCIOP_Connection_Handler, "$Id$") - TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SCIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index f37b40d05e2..741bb4762e4 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -68,7 +68,7 @@ public: TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0); - /// Constructor. + /// Constructor. TAO_SCIOP_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag); @@ -137,10 +137,6 @@ private: int dscp_codepoint_; }; -#if defined (__ACE_INLINE__) -#include "SCIOP_Connection_Handler.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.i b/TAO/tao/Strategies/SCIOP_Connection_Handler.i deleted file mode 100644 index aa25cd5a09f..00000000000 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.i +++ /dev/null @@ -1,3 +0,0 @@ -// -*- C++ -*- - -// $Id$ diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index e196c9cbf1f..06b991b58c7 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -16,10 +16,6 @@ ACE_RCSID(Strategies, SCIOP_Profile, "$Id$") -#if !defined (__ACE_INLINE__) -# include "SCIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - static const char prefix_[] = "sciop"; const char TAO_SCIOP_Profile::object_key_delimiter_ = '/'; diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 017f255f363..5310af754b0 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -133,10 +133,6 @@ protected: CORBA::ULong count_; }; -#if defined (__ACE_INLINE__) -# include "SCIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Profile.i b/TAO/tao/Strategies/SCIOP_Profile.i deleted file mode 100644 index c130d6682b1..00000000000 --- a/TAO/tao/Strategies/SCIOP_Profile.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 4c7ae666b5f..0fbaca58cda 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -23,16 +23,10 @@ #include "tao/Protocols_Hooks.h" #include "tao/Adapter.h" -#if !defined (__ACE_INLINE__) -# include "SCIOP_Transport.i" -#endif /* ! __ACE_INLINE__ */ - - ACE_RCSID (tao, SCIOP_Transport, "$Id$") - TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean ) diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index 6f159a4f387..e51f42b5778 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -137,11 +137,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; - -#if defined (__ACE_INLINE__) -#include "SCIOP_Transport.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Transport.i b/TAO/tao/Strategies/SCIOP_Transport.i deleted file mode 100644 index abffb63d92a..00000000000 --- a/TAO/tao/Strategies/SCIOP_Transport.i +++ /dev/null @@ -1,4 +0,0 @@ -// -*- C++ -*- - -// $Id$ - diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 43f795799a6..bd353d0a6ea 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -13,10 +13,6 @@ #include "tao/Codeset_Manager.h" #include "tao/CDR.h" -#if !defined(__ACE_INLINE__) -#include "SHMIOP_Acceptor.i" -#endif /* __ACE_INLINE__ */ - #include "ace/os_include/os_netdb.h" #include "ace/os_include/os_ctype.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index 8fc343bbaba..ef369ad0f9c 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -148,10 +148,6 @@ private: CORBA::Boolean lite_flag_; }; -#if defined(__ACE_INLINE__) -#include "SHMIOP_Acceptor.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.i b/TAO/tao/Strategies/SHMIOP_Acceptor.i deleted file mode 100644 index c130d6682b1..00000000000 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 7c0cfa328a9..c37dff54de1 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -17,10 +17,6 @@ #include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" -#if !defined (__ACE_INLINE__) -# include "SHMIOP_Connection_Handler.inl" -#endif /* ! __ACE_INLINE__ */ - #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 08b6c387626..fbfa34bc1fc 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -103,12 +103,6 @@ private: }; - - -#if defined (__ACE_INLINE__) -#include "SHMIOP_Connection_Handler.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl b/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl deleted file mode 100644 index 7f2b3228624..00000000000 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.inl +++ /dev/null @@ -1,3 +0,0 @@ -// -*- C++ -*- -// $Id$ - diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 4bffe984ea4..53f3cf1c316 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -16,10 +16,6 @@ ACE_RCSID (Strategies, SHMIOP_Profile, "$Id$") -#if !defined (__ACE_INLINE__) -# include "SHMIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - #include "ace/os_include/os_netdb.h" static const char prefix_[] = "shmiop"; @@ -514,6 +510,4 @@ TAO_SHMIOP_Profile::decode_endpoints (void) return 0; } - - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index e7bc47ffe83..b7f367aea82 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -122,10 +122,6 @@ private: CORBA::ULong count_; }; -#if defined (__ACE_INLINE__) -# include "SHMIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Profile.i b/TAO/tao/Strategies/SHMIOP_Profile.i deleted file mode 100644 index c130d6682b1..00000000000 --- a/TAO/tao/Strategies/SHMIOP_Profile.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index aaebc6860cf..35ac575d819 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -19,11 +19,6 @@ #include "tao/GIOP_Message_Base.h" #include "tao/GIOP_Message_Lite.h" - -#if !defined (__ACE_INLINE__) -# include "SHMIOP_Transport.i" -#endif /* ! __ACE_INLINE__ */ - ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 02c67c63116..a8655d8c1db 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -116,12 +116,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; - - -#if defined (__ACE_INLINE__) -#include "SHMIOP_Transport.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Transport.i b/TAO/tao/Strategies/SHMIOP_Transport.i deleted file mode 100644 index 81bf354f364..00000000000 --- a/TAO/tao/Strategies/SHMIOP_Transport.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -//$Id$ diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 57f64dccbd8..ebe3bb32c4e 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -19,11 +19,6 @@ #include "tao/Thread_Lane_Resources.h" #include "tao/Protocols_Hooks.h" -#if !defined (__ACE_INLINE__) -# include "UIOP_Connection_Handler.inl" -#endif /* ! __ACE_INLINE__ */ - - ACE_RCSID (Strategies, UIOP_Connection_Handler, "$Id$") diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index 021a13ca345..ca14c8aeb4a 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -100,12 +100,6 @@ protected: //@} }; - - -#if defined (__ACE_INLINE__) -#include "UIOP_Connection_Handler.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.inl b/TAO/tao/Strategies/UIOP_Connection_Handler.inl deleted file mode 100644 index 7f2b3228624..00000000000 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.inl +++ /dev/null @@ -1,3 +0,0 @@ -// -*- C++ -*- -// $Id$ - diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i index b89b850aacf..337bbae6a76 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.i +++ b/TAO/tao/Strategies/UIOP_Endpoint.i @@ -16,5 +16,4 @@ TAO_UIOP_Endpoint::rendezvous_point (void) const return this->object_addr_.get_path_name (); } - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 02d5a190c0a..a04757d7225 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -18,10 +18,6 @@ ACE_RCSID (Strategies, UIOP_Profile, "$Id$") -#if !defined (__ACE_INLINE__) -# include "UIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - static const char prefix_[] = "uiop"; const char TAO_UIOP_Profile::object_key_delimiter_ = '|'; diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index 008e4650edb..069c5105965 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -120,10 +120,6 @@ private: CORBA::ULong count_; }; -#if defined (__ACE_INLINE__) -# include "UIOP_Profile.i" -#endif /* __ACE_INLINE__ */ - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Profile.i b/TAO/tao/Strategies/UIOP_Profile.i deleted file mode 100644 index c130d6682b1..00000000000 --- a/TAO/tao/Strategies/UIOP_Profile.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 9170a538447..936d3bfbc22 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -17,15 +17,10 @@ #include "tao/GIOP_Message_Base.h" #include "tao/GIOP_Message_Lite.h" -#if !defined (__ACE_INLINE__) -# include "UIOP_Transport.i" -#endif /* ! __ACE_INLINE__ */ - ACE_RCSID (Strategies, UIOP_Transport, "$Id$") - TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 3fcdafbc21e..aefcb26ecbc 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -110,12 +110,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; - - -#if defined (__ACE_INLINE__) -#include "UIOP_Transport.i" -#endif /* __ACE_INLINE__ */ - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.i b/TAO/tao/Strategies/UIOP_Transport.i deleted file mode 100644 index 81bf354f364..00000000000 --- a/TAO/tao/Strategies/UIOP_Transport.i +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -//$Id$ diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 6de37510307..2703a4e1590 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -2,10 +2,6 @@ #include "advanced_resource.h" -#if !defined (__ACE_INLINE__) -# include "advanced_resource.i" -#endif /* ! __ACE_INLINE__ */ - #include "UIOP_Factory.h" #include "SHMIOP_Factory.h" #include "DIOP_Factory.h" diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index 656b1d84816..4e3fa7508c6 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -11,7 +11,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - #include "tao/ORB_Core.h" class TAO_Connection_Purging_Strategy; @@ -134,10 +133,6 @@ protected: }; -#if defined (__ACE_INLINE__) -#include "advanced_resource.i" -#endif /* __ACE_INLINE__ */ - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory) diff --git a/TAO/tao/Strategies/advanced_resource.i b/TAO/tao/Strategies/advanced_resource.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/tao/Strategies/advanced_resource.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ |