diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-29 15:16:30 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-29 15:16:30 +0000 |
commit | a45dd30e91f54dcd3f3e2583e554883f320d73d3 (patch) | |
tree | 542e1c1d808d3771607806ee7f06bb0c65470204 /TAO | |
parent | 70876c39c9903498bb567faa2be42817d76e6cc2 (diff) | |
download | ATCD-a45dd30e91f54dcd3f3e2583e554883f320d73d3.tar.gz |
ChangeLogTag:Mon Dec 29 15:10:40 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'TAO')
23 files changed, 55 insertions, 38 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4f4d146961c..6bd0975dc66 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,31 @@ +Mon Dec 29 15:10:40 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * orbsvcs/orbsvcs/Event_Service_Constants.h: + * orbsvcs/orbsvcs/Makefile.RTCosScheduling: + * orbsvcs/orbsvcs/Concurrency/CC_Lock.h: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h: + * orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h: + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: + * orbsvcs/orbsvcs/Event/GPlot_File.h: + * orbsvcs/orbsvcs/Event/Memory_Pools.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: + * orbsvcs/orbsvcs/Naming/Entries.h: + * orbsvcs/orbsvcs/Notify/Refcountable.{h,cpp}: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h: + * orbsvcs/orbsvcs/Sched/DynSched.h: + * orbsvcs/orbsvcs/Sched/Scheduler.{h,cpp}: + * orbsvcs/tests/Property/client.h: + * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h: + Fixed Synch[_T].h fuzz errors by removing #include Synch[_T].h + and refactoring includes. + + * tao/Messaging/Asynch_Invocation.cpp: + Fixed explicit tempate instatiation to use + TAO::Utils::Auto_Functor<> instead of auto_ptr<>. + Mon Dec 29 13:32:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Fixed_Size_Argument_T.h: diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 345022b1f50..668ee73708b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -19,7 +19,7 @@ #define _CC_LOCK_H #include /**/ "ace/pre.h" -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index dd1548794bb..75bb4e1a88f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -34,12 +34,13 @@ #include /**/ "ace/pre.h" -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Thread_Mutex.h" #include "ace/Token.h" #include "ace/Unbounded_Queue.h" diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h index f98acb694ee..964e32736e5 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/orbconf.h" -#include "ace/Synch.h" +#include "ace/Thread_Mutex.h" class TAO_ETCL_Constraint; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 2ef9987d9da..3149420a6f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -7,7 +7,6 @@ #include "EC_ConsumerAdmin.h" #include "EC_SupplierAdmin.h" #include "orbsvcs/Event_Service_Constants.h" -#include "ace/Synch.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h index 0e74f4002f6..2975c9df458 100644 --- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h +++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" /** * @class ACE_GPlot_File diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h index 824589bc4b2..c79028c029f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h +++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h @@ -14,7 +14,7 @@ #define ACE_MEMORY_POOLS_H #include /**/ "ace/pre.h" -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,6 +23,8 @@ #include "Event_Channel.h" #include "Dispatching_Modules.h" #include "ace/Malloc.h" +#include "ace/Thread_Mutex.h" +#include "ace/Null_Mutex.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 361e8008751..075adda129a 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -23,8 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" - #include "orbsvcs/Time_Utilities.h" /// This is the number of events a consumer can subscribe to. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 5003c38d475..478b6d22b63 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -24,7 +24,8 @@ #include "orbsvcs/CosLoadBalancingS.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" namespace TAO_LB { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 2264a83c08f..c64c5c3321b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -15,6 +15,7 @@ #include "ace/Reactor.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Reverse_Lock_T.h" ACE_RCSID (LoadBalancing, LB_LoadManager, diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling index 40250043f25..b60a9b1f6c8 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling @@ -68,7 +68,7 @@ endif LDFLAGS += -L../../../lib -TAO_IDLFLAGS += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h -Gv -I../.. -I../../orbsvcs -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h +override TAO_IDLFLAGS += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h -Gv -I../.. -I../../orbsvcs -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 7b50eb32eda..52e5a30a266 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch.h" #include "ace/SString.h" #include "orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index 6e432eec14e..7d378105c84 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -8,6 +8,8 @@ #include "Refcountable.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Guard_T.h" + ACE_RCSID(Notify, TAO_Notify_Refcountable, "$Id$") TAO_Notify_Refcountable::TAO_Notify_Refcountable (void) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 0c00939c123..696d491e724 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -20,10 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Synch_T.h" - #include "tao/orbconf.h" #include "tao/Basic_Types.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" /** * @class TAO_Notify_Refcountable diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index e017282b06a..d36affa5d6a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -31,7 +31,6 @@ #include "UIPMC_Endpoint.h" #include "portablegroup_export.h" -#include "ace/Synch.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index 0026d265d16..945f6067706 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -22,7 +22,6 @@ #include "ace/SOCK_Stream.h" -#include "ace/Synch.h" #include "ace/Svc_Handler.h" #include "portablegroup_export.h" diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h index 6db001c86cb..bda85f40a2d 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h @@ -16,7 +16,7 @@ #define PCP_MANAGER_H #include /**/ "ace/pre.h" -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index d3cfadfab4e..a3adb00f642 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -29,7 +29,6 @@ #include "ace/Map_Manager.h" #include "ace/Message_Block.h" -#include "ace/Synch.h" #include "ace/SString.h" #include "SchedEntry.h" #include "sched_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index f7b44f4249f..9619eceb420 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -25,6 +25,8 @@ #include "Scheduler.i" #endif /* __ACE_INLINE__ */ +#include "ace/Lock_Adapter_T.h" + ACE_RCSID(Sched, Scheduler, "$Id$") /////////////////////////////////////////////////////////////////////////////// @@ -273,8 +275,6 @@ ACE_Scheduler::dispatch_configuration (const Preemption_Priority & p_priority, // provide the thread priority and queue type for the given priority level - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index ec4f2d34058..abb37fc6cee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -30,7 +30,6 @@ #include "ace/Map_Manager.h" #include "ace/Message_Block.h" -#include "ace/Synch.h" #include "ace/SString.h" #include "ace/Unbounded_Set.h" diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 0361f0c6795..68ea5861f2e 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -20,7 +20,7 @@ #ifndef PROPERTY_CLIENT_H #define PROPERTY_CLIENT_H -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h index cd169ebe4d0..98b43509b90 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -18,7 +18,7 @@ #ifndef TASK_CLIENT_H #define TASK_CLIENT_H -#include "ace/Synch.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index d7801b73489..5c3925f38e0 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -186,21 +186,11 @@ namespace TAO } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr<TAO_Asynch_Reply_Dispatcher_Base>; -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_Asynch_Reply_Dispatcher_Base>; -# endif /* ACE_LACKS_AUTO_PTR */ - +# if TAO_HAS_INTERCEPTORS == 1 + template class TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor>; +# endif #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr<TAO_Asynch_Reply_Dispatcher_Base> -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Asynch_Reply_Dispatcher_Base> -# endif /* ACE_LACKS_AUTO_PTR */ - +# if TAO_HAS_INTERCEPTORS == 1 +# pragma instantiate TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor> +# endif #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |