From 97ab035ead6d942c06c916adbf8c7e5a89178295 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 15:33:20 +0200 Subject: Removed empty inline files * TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl: * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl: * TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl: * TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl: Deleted. * TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp: * TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h: * TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h: * TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp: * TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h: * TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp: * TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h: --- TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl | 5 ----- TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl | 5 ----- TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl | 6 ------ TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h | 4 ---- TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl | 5 ----- 11 files changed, 49 deletions(-) delete mode 100644 TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl delete mode 100644 TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl delete mode 100644 TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl delete mode 100644 TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp index f1ef71572b6..08b2b33d1b0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp @@ -6,10 +6,6 @@ #include "EC_Destroyer.h" -#if !defined(__ACE_INLINE__) -#include "EC_Destroyer.inl" -#endif /* __ACE_INLINE__ */ - EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec) : ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h index 88e7c470977..f4078e534df 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h @@ -38,8 +38,4 @@ private: RtecEventChannelAdmin::EventChannel_var ec_; }; -#if defined(__ACE_INLINE__) -#include "EC_Destroyer.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_EC_DESTROYER_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl deleted file mode 100644 index 5af0172c245..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file EC_Destroyer.inl - * - * @author Carlos O'Ryan - */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h index 48666a2bdde..5b4bfff8edf 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h @@ -73,8 +73,4 @@ private: ACE_Thread_Manager thr_mgr_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Low_Priority_Setup.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - #endif /* TAO_PERF_RTEC_LOW_PRIORITY_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl deleted file mode 100644 index a568d801898..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file Low_Priority_Setup.inl - * - * @author Carlos O'Ryan - */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp index e572d42ac75..00786c73bde 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp @@ -9,10 +9,6 @@ #include "RIR_Narrow.h" #include "tao/Policy_ManagerC.h" -#if !defined(__ACE_INLINE__) -#include "PriorityBand_Setup.inl" -#endif /* __ACE_INLINE__ */ - PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, const RTCORBA_Setup &rtcorba_setup) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h index 62889e0527c..f0f23d54db3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h @@ -35,8 +35,4 @@ public: ~PriorityBand_Setup (void); }; -#if defined(__ACE_INLINE__) -#include "PriorityBand_Setup.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_PRIORITYBAND_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl deleted file mode 100644 index 54a3ef0e5de..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl +++ /dev/null @@ -1,6 +0,0 @@ -/** - * @file PriorityBand_Setup.inl - * - * @author Carlos O'Ryan - */ - diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp index b897fc4c96d..a75014c780a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp @@ -8,10 +8,6 @@ #include "RIR_Narrow.h" #include "tao/AnyTypeCode/Any.h" -#if !defined(__ACE_INLINE__) -#include "SyncScope_Setup.inl" -#endif /* __ACE_INLINE__ */ - SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb, Messaging::SyncScope value) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h index 5f4d1b441f5..75689632305 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h @@ -40,8 +40,4 @@ private: Messaging::SyncScope value); }; -#if defined(__ACE_INLINE__) -#include "SyncScope_Setup.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_SYNCSCOPE_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl deleted file mode 100644 index efa4eba2fc4..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file SyncScope_Setup.inl - * - * @author Carlos O'Ryan - */ -- cgit v1.2.1 From 6dd22625d702d60cb6d0d0368b7cfc7d849d8425 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 15:34:10 +0200 Subject: Removed priorityband_setup_ member, not used * TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp: * TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h: --- TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp | 7 ------- TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h | 1 - 2 files changed, 8 deletions(-) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index da170a07a03..ebc81aa22b0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -28,12 +28,5 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, new RTCORBA_Setup (orb, rt_class, nthreads)); - -#if 0 - ACE_auto_ptr_reset (this->priorityband_setup_, - new PriorityBand_Setup (orb, - *this->rtcorba_setup_)); - -#endif /* 0 */ } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h index bf6044196ba..82ee76d81fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h @@ -43,7 +43,6 @@ private: int use_rt_corba_; auto_ptr rtcorba_setup_; - auto_ptr priorityband_setup_; SyncScope_Setup syncscope_setup_; }; -- cgit v1.2.1 From d23ea58f6eac4e23783ea9a7bb53d8bfdad2303c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 15:37:45 +0200 Subject: Removed not needed include * TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h: --- TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h index aeb1f8daf2f..c817a22f08c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h @@ -10,7 +10,6 @@ #include "rtec_perf_export.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,8 +37,7 @@ public: RTCORBA::Priority process_priority (void) const; private: - void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane - ); + void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane); private: RTCORBA::PriorityMappingManager_var priority_mapping_manager_; -- cgit v1.2.1 From 9c1d915a45893a7acb2d763663cff78dcd6f7f25 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 15:37:54 +0200 Subject: Add missing include * TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp: --- TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 2d582b4de62..865bc73a6f2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -12,6 +12,7 @@ #include "orbsvcs/Event/EC_RTCORBA_Factory.h" #include "ace/Dynamic_Service.h" +#include "ace/Auto_Ptr.h" TAO_EC_Event_Channel * RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa, -- cgit v1.2.1 From 7ab9d7d683b34a37d766a11d7cd7abd4ee66b18c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 16:45:54 +0200 Subject: Fixed CodeFactor issue * TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp: --- TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index ebc81aa22b0..e037fbf7d54 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -21,7 +21,6 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, : use_rt_corba_ (use_rt_corba) , syncscope_setup_ (orb) { - if (use_rt_corba) { ACE_auto_ptr_reset (this->rtcorba_setup_, -- cgit v1.2.1 From d8f5b041e7710132a469ebf890dbd00ec0f8732e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 21:25:40 +0200 Subject: Revert change --- TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h index 5b4bfff8edf..48666a2bdde 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h @@ -73,4 +73,8 @@ private: ACE_Thread_Manager thr_mgr_; }; +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "Low_Priority_Setup.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + #endif /* TAO_PERF_RTEC_LOW_PRIORITY_SETUP_H */ -- cgit v1.2.1