From cc5beeb55df7498a075eb54e2a5ded3554e756e4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 5 Jan 2005 10:50:53 +0000 Subject: ChangeLogTag: Wed Jan 5 10:45:12 UTC 2005 Johnny Willemsen --- TAO/CIAO/ChangeLog | 10 ++++++++-- TAO/ChangeLog | 9 +++++++++ TAO/tao/Makefile.am | 2 -- TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp | 6 +----- TAO/tao/RTPortableServer/RT_Acceptor_Filters.h | 4 ---- TAO/tao/RTPortableServer/RT_Acceptor_Filters.i | 3 --- TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp | 8 +++----- TAO/tao/RTPortableServer/RT_Collocation_Resolver.h | 4 ---- TAO/tao/RTPortableServer/RT_Collocation_Resolver.i | 1 - TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp | 2 +- TAO/tao/RTPortableServer/RT_Policy_Validator.cpp | 3 --- 11 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 TAO/tao/RTPortableServer/RT_Acceptor_Filters.i delete mode 100644 TAO/tao/RTPortableServer/RT_Collocation_Resolver.i diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 9d7600f5fed..b9e8fd4a0fc 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,6 +1,12 @@ +Wed Jan 5 10:45:12 UTC 2005 Johnny Willemsen + + * DAnCE/RTNodeApplication/RTServer_Impl.h: + Fixed compile problem in emulated exception builds due to + incorrect environment macro + Mon Jan 3 10:01:09 2005 Nanbor Wang - * DAnCE/RTNodeApplication/README: + * DAnCE/RTNodeApplication/README: * DAnCE/RTNodeApplication/NodeApplication_Task.cpp: * DAnCE/RTNodeApplication/NodeApplication_Task.h: * DAnCE/RTNodeApplication/NodeApplication_Task.inl: @@ -10,7 +16,7 @@ Mon Jan 3 10:01:09 2005 Nanbor Wang * DAnCE/RTNodeApplication/RTServer_Impl.h: * DAnCE/RTNodeApplication/RTServer_Impl.inl: * DAnCE/RTNodeApplication/senv.sh: Added a minimal - real-time-enabled NodeApplication server. + real-time-enabled NodeApplication server. Mon Jan 3 12:20:12 UTC 2005 Johnny Willemsen diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 53bdd37f93c..da95ab8589e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Jan 5 10:50:12 UTC 2005 Johnny Willemsen + + * tao/RTPortableServer/RT_Acceptor_Filters.{h,cpp,i}: + * tao/RTPortableServer/RT_Collocation_Resolver.{h,cpp,i}: + Removed i file and updated h/cpp file. + + * tao/Makefile.am + Updated for changes above + Wed Jan 5 10:16:12 UTC 2005 Johnny Willemsen * tao/Messaging/Asynch_Reply_Dispatcher.{h,cpp,i}: diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 2e45ce36342..4eb9702ac8c 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1772,8 +1772,6 @@ nobase_include_HEADERS += \ RTPortableServer/RT_Servant_Dispatcher.h \ RTPortableServer/rtportableserver_export.h \ RTPortableServer/RTPortableServerC.inl \ - RTPortableServer/RT_Acceptor_Filters.i \ - RTPortableServer/RT_Collocation_Resolver.i \ RTPortableServer/RT_POA.i \ RTPortableServer/RTPortableServer.pidl diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp index eeaed35df3d..0ebc6f73ac2 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp @@ -8,11 +8,7 @@ #include "tao/MProfile.h" #include "tao/Profile.h" -#if ! defined (__ACE_INLINE__) -#include "RT_Acceptor_Filters.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, +ACE_RCSID (RTPortableServer, RT_Acceptor_Filter, "$Id$") diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index d6402e4f96f..2a8cfe9fea0 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -63,10 +63,6 @@ private: RTCORBA::ProtocolList &protocols_; }; -#if defined (__ACE_INLINE__) -#include "RT_Acceptor_Filters.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i deleted file mode 100644 index f4f84bd4f2e..00000000000 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.i +++ /dev/null @@ -1,3 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 45bf620a40f..7487e128b7d 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -4,7 +4,9 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$") +ACE_RCSID(RTPortableServer, + RT_Collocation_Resolver, + "$Id$") #include "tao/ORB_Core.h" #include "tao/Object.h" @@ -14,10 +16,6 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$") #include "tao/RTCORBA/Thread_Pool.h" #include "tao/Profile.h" -#if !defined (__ACE_INLINE__) -# include "tao/RTPortableServer/RT_Collocation_Resolver.i" -#endif /* ! __ACE_INLINE__ */ - CORBA::Boolean TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL) const diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index 3fe8a0375d7..99d89bff36d 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -47,10 +47,6 @@ public: ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) -#if defined (__ACE_INLINE__) -# include "tao/RTPortableServer/RT_Collocation_Resolver.i" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 3a0c307474f..bcfa7a8dbe6 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -10,7 +10,7 @@ #include "RT_Policy_Validator.h" #include "RT_Collocation_Resolver.h" -ACE_RCSID (TAO_RTPortableServer, +ACE_RCSID (RTPortableServer, RT_Object_Adapter_Factory, "$Id$") diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 345af1c16bc..cdea3350ccd 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -14,13 +14,10 @@ #include "tao/Policy_Set.h" #include "tao/Transport_Acceptor.h" - - ACE_RCSID (RTPortableServer, RT_Policy_Validator, "$Id$") - TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core), thread_pool_ (0) -- cgit v1.2.1