diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 19:32:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 19:32:37 +0000 |
| commit | 55ed1d4418ead01f711e6c812f204ae4453cf127 (patch) | |
| tree | d1682ee4c1a01734f8e87a43a2e02905df9c7016 | |
| parent | 676273d4faf9f04015ef33815346f28ccd1a4d0d (diff) | |
| download | ATCD-55ed1d4418ead01f711e6c812f204ae4453cf127.tar.gz | |
ChangeLogTag: Wed Jan 5 19:30:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.am | 3 |
6 files changed, 9 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d645f705a7a..4d5a8419a0e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 5 19:30:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.{h,cpp,i}: + * orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.{h,cpp,i}: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.{h,cpp,i}: + * orbsvcs/orbsvcs/ESF/ESF_Worker.{h,cpp,i}: + Removed i file, update h/cpp + Wed Jan 5 19:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/Key_Adapters.{h,cpp,i}: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 3b539e76378..a370e8b9755 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -12,10 +12,6 @@ #include "tao/Client_Strategy_Factory.h" #include "tao/CDR.h" -#if !defined (__ACE_INLINE__) -# include "FT_Service_Callbacks.inl" -#endif /* __ACE_INLINE__ */ - ACE_RCSID (FaultTolerance, FT_Service_Callbacks, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index b4f496ea24f..2ecba6fc49e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -107,9 +107,5 @@ private: CORBA::Boolean group_component_flag_; }; -#if defined (__ACE_INLINE__) -# include "FT_Service_Callbacks.inl" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /*TAO_FT_CALLBACKS_H*/ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i deleted file mode 100644 index ca0908bbcf6..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.i +++ /dev/null @@ -1 +0,0 @@ -//$Id$ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl deleted file mode 100644 index ca0908bbcf6..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.inl +++ /dev/null @@ -1 +0,0 @@ -//$Id$ diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am index ffda87230c7..05c563439c4 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.am +++ b/TAO/orbsvcs/orbsvcs/Makefile.am @@ -3696,8 +3696,7 @@ nobase_include_HEADERS += \ FaultTolerance/FT_Endpoint_Selector_Factory.h \ FaultTolerance/FT_Invocation_Endpoint_Selectors.h \ FaultTolerance/FT_Service_Callbacks.h \ - FaultTolerance/FT_ClientPolicy_i.inl \ - FaultTolerance/FT_Service_Callbacks.i + FaultTolerance/FT_ClientPolicy_i.inl endif !BUILD_MINIMUM_CORBA endif BUILD_ACE_UUID |