diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-16 11:16:03 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-16 11:16:03 +0000 |
commit | 0480a34d7d284fd89a537dc9b65a55bad8f8ec6e (patch) | |
tree | cc433e41e8aecb592979b17b78319f9f2bbeebbc /TAO | |
parent | bfadf1cfd6b1d22eccac46a4cdd3fae185f1944e (diff) | |
download | ATCD-0480a34d7d284fd89a537dc9b65a55bad8f8ec6e.tar.gz |
Tue Jan 16 11:15:10 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h | 20 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Consumer_T.h | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Peer_T.h | 24 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Supplier_T.h | 16 |
10 files changed, 61 insertions, 47 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7d4d8ac79b3..acb60356366 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Tue Jan 16 11:15:10 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp: + Initialise pointer with 0 + + * orbsvcs/orbsvcs/Notify/Event_Map_T.h: + * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h: + * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h: + * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h: + * orbsvcs/tests/Notify/lib/Consumer_T.h: + * orbsvcs/tests/Notify/lib/Peer_T.h: + * orbsvcs/tests/Notify/lib/Supplier_T.h: + Use typename instead of ACE_TYPENAME + Tue Jan 16 08:18:10 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/CollocationLockup/CollocationLockup.cpp: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 1da0a14348d..495f570e10f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -155,7 +155,7 @@ namespace TAO } ACE_ENDTRY; - if (status == PortableInterceptor::LOCATION_FORWARD) + if (status == PortableInterceptor::LOCATION_FORWARD) { // We are in an FT request and a location forward has been received. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 5ea2a76ec77..ffaf522468e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -213,7 +213,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #if defined (linux) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) - CosLoadBalancing::LoadList * tmp; + CosLoadBalancing::LoadList * tmp = 0; ACE_NEW_THROW_EX (tmp, CosLoadBalancing::LoadList (1), CORBA::NO_MEMORY ( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 011cb6530da..039a8bcedf6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -71,10 +71,10 @@ public: ENTRY* find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL); /// Find the default broadcast list. - ACE_TYPENAME ENTRY::COLLECTION* broadcast_collection (void); + typename ENTRY::COLLECTION* broadcast_collection (void); /// Find the update list. This is all the PROXYS connected to this Map. - ACE_TYPENAME ENTRY::COLLECTION* updates_collection (void); + typename ENTRY::COLLECTION* updates_collection (void); /// Release the usage count on this entry. void release (ENTRY* entry); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index b66b0f389bd..c6867cff861 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -122,8 +122,8 @@ class TAO_RSE_DFS_Visitor : public: TAO_RSE_DFS_Visitor - (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, - ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); + (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, + typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); // Constructor. protected: @@ -169,8 +169,8 @@ class TAO_RSE_SCC_Visitor : public: TAO_RSE_SCC_Visitor - (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, - ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); + (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, + typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); // Constructor. int number_of_cycles (void); @@ -246,8 +246,8 @@ class TAO_RSE_Reverse_Propagation_Visitor : public: TAO_RSE_Reverse_Propagation_Visitor - (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, - ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); + (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, + typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); // Constructor. protected: @@ -277,8 +277,8 @@ class TAO_RSE_Forward_Propagation_Visitor : public: TAO_RSE_Forward_Propagation_Visitor - (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, - ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); + (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, + typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); // Constructor. int unresolved_locals (void); @@ -461,8 +461,8 @@ class TAO_RSE_Criticality_Propagation_Visitor : public: TAO_RSE_Criticality_Propagation_Visitor - (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, - ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); + (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, + typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); // Constructor. protected: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index ec7f53542bb..431ad92bda1 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -553,7 +553,7 @@ protected: virtual void map_dependency_i (RtecScheduler::handle_t key, RtecScheduler::handle_t handle, - ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, + typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, RtecScheduler::Dependency_Enabled_Type_t enabled @@ -565,7 +565,7 @@ protected: void unmap_dependency_i (RtecScheduler::handle_t key, RtecScheduler::handle_t handle, - ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, + typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type ACE_ENV_ARG_DECL) @@ -576,7 +576,7 @@ protected: void map_dependency_enable_state_i (RtecScheduler::handle_t key, RtecScheduler::handle_t handle, - ACE_TYPENAME + typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h index 3cb61f27724..ae3d9351f7b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h @@ -24,8 +24,8 @@ template<class Interface> class RIR_Narrow { public: - typedef ACE_TYPENAME Interface::_ptr_type Interface_ptr; - typedef ACE_TYPENAME Interface::_var_type Interface_var; + typedef typename Interface::_ptr_type Interface_ptr; + typedef typename Interface::_var_type Interface_var; static Interface_ptr resolve (CORBA::ORB_ptr orb, const char *object_id diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index 82f23b0af2a..59aaa305d2c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -44,14 +44,14 @@ class TAO_Notify_Tests_ConsumerAdmin_Ext_Traits template <class Consumer_Traits> class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Traits> { - typedef ACE_TYPENAME Consumer_Traits::Admin_Traits Admin_Traits; - typedef ACE_TYPENAME Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits; - typedef ACE_TYPENAME Consumer_Traits::Proxy_Traits Proxy_Traits; - - typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; - typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR; - typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR; - typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; + typedef typename Consumer_Traits::Admin_Traits Admin_Traits; + typedef typename Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits; + typedef typename Consumer_Traits::Proxy_Traits Proxy_Traits; + + typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; + typedef typename Proxy_Traits::PTR Proxy_Traits_PTR; + typedef typename Admin_Traits::PTR Admin_Traits_PTR; + typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; public: /// Constuctor diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 0356c52d844..eafdc02a172 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -29,20 +29,20 @@ template <class Peer_Traits> class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON { - typedef ACE_TYPENAME Peer_Traits::Admin_Traits Admin_Traits; - typedef ACE_TYPENAME Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits; - typedef ACE_TYPENAME Peer_Traits::Proxy_Traits Proxy_Traits; + typedef typename Peer_Traits::Admin_Traits Admin_Traits; + typedef typename Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits; + typedef typename Peer_Traits::Proxy_Traits Proxy_Traits; - typedef ACE_TYPENAME Peer_Traits::PTR Peer_Traits_PTR; + typedef typename Peer_Traits::PTR Peer_Traits_PTR; - typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; - typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR; - typedef ACE_TYPENAME Proxy_Traits::ID Proxy_Traits_ID; + typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; + typedef typename Proxy_Traits::PTR Proxy_Traits_PTR; + typedef typename Proxy_Traits::ID Proxy_Traits_ID; - typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR; + typedef typename Admin_Traits::PTR Admin_Traits_PTR; - typedef ACE_TYPENAME Admin_Ext_Traits::INTERFACE Admin_Ext_Traits_INTERFACE; - typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; + typedef typename Admin_Ext_Traits::INTERFACE Admin_Ext_Traits_INTERFACE; + typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; public: /// Constuctor @@ -103,10 +103,10 @@ protected: // = Data Members /// The proxy that we are connected to. - ACE_TYPENAME Proxy_Traits::VAR proxy_; + typename Proxy_Traits::VAR proxy_; /// This <proxy_> id. - ACE_TYPENAME Proxy_Traits::ID proxy_id_; + typename Proxy_Traits::ID proxy_id_; }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index 54d2faba200..046359398f3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -44,14 +44,14 @@ class TAO_Notify_Tests_SupplierAdmin_Ext_Traits template <class Supplier_Traits> class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Traits> { - typedef ACE_TYPENAME Supplier_Traits::Admin_Traits Admin_Traits; - typedef ACE_TYPENAME Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits; - typedef ACE_TYPENAME Supplier_Traits::Proxy_Traits Proxy_Traits; - - typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; - typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR; - typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR; - typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; + typedef typename Supplier_Traits::Admin_Traits Admin_Traits; + typedef typename Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits; + typedef typename Supplier_Traits::Proxy_Traits Proxy_Traits; + + typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE; + typedef typename Proxy_Traits::PTR Proxy_Traits_PTR; + typedef typename Admin_Traits::PTR Admin_Traits_PTR; + typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR; public: /// Constuctor |