diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 19:29:10 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 19:29:10 +0000 |
commit | ddf4c3f749eef80dfa82cf5c675a258b58e113af (patch) | |
tree | b23a946cece9e930875f99a722f1b912e6c81d12 /TAO/orbsvcs | |
parent | 54e7748788230a3595cbc48ed4a142adc8ec322d (diff) | |
download | ATCD-ddf4c3f749eef80dfa82cf5c675a258b58e113af.tar.gz |
ChangeLogTag: Wed Jan 5 19:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp | 8 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i | 1 |
12 files changed, 2 insertions, 42 deletions
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 12e6316ed47..55055171241 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -4,11 +4,6 @@ #define TAO_ESF_COPY_ON_READ_CPP #include "ESF_Copy_On_Read.h" - -#if ! defined (__ACE_INLINE__) -#include "ESF_Copy_On_Read.i" -#endif /* __ACE_INLINE__ */ - #include "ESF_Worker.h" ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 98578fe4fb5..f0b704632f6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -58,10 +58,6 @@ private: // **************************************************************** -#if defined (__ACE_INLINE__) -#include "ESF_Copy_On_Read.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Copy_On_Read.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index c514674fda3..b2b99d61a83 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -3,12 +3,6 @@ #ifndef TAO_ESF_PEER_ADMIN_CPP #define TAO_ESF_PEER_ADMIN_CPP - - -#if ! defined (__ACE_INLINE__) -#include "ESF_Peer_Admin.i" -#endif /* __ACE_INLINE__ */ - #include "ESF_Peer_Workers.h" ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 646fab48906..8cb50b3d57c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -92,10 +92,6 @@ public: // **************************************************************** -#if defined (__ACE_INLINE__) -#include "ESF_Peer_Admin.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Peer_Admin.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp index 2cb0b663040..798a34d0cb9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp @@ -6,12 +6,8 @@ #include "ESF_Proxy_Collection.h" #include "ESF_Worker.h" -#if ! defined (__ACE_INLINE__) -#include "ESF_Proxy_Collection.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (ESF, - ESF_Proxy_Collection, +ACE_RCSID (ESF, + ESF_Proxy_Collection, "$Id$") // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index e9f6227e839..7777d37e830 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -157,10 +157,6 @@ public: // **************************************************************** -#if defined (__ACE_INLINE__) -#include "ESF_Proxy_Collection.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Proxy_Collection.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp index c0adf25c221..6ffea97b026 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp @@ -5,10 +5,6 @@ #include "ESF_Worker.h" -#if ! defined (__ACE_INLINE__) -#include "ESF_Worker.i" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(ESF, ESF_Worker, "$Id$") template<class Object> diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index 69563574aa9..0acfb7b660d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -49,10 +49,6 @@ public: ACE_ENV_ARG_DECL) = 0; }; -#if defined (__ACE_INLINE__) -#include "ESF_Worker.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ESF_Worker.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ |