diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-25 20:26:53 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-25 20:26:53 +0200 |
commit | b940c3951fb908fcdaa3c8490803ac7459dfc0a5 (patch) | |
tree | e08cb15d12d2994bd53be3db616c98a80321e4a0 | |
parent | ae66b5d5676e7e0e02b543e5a721e67a7e338abc (diff) | |
parent | 26212992b6723c287d231fa0a6b8e2ebf059533c (diff) | |
download | ATCD-b940c3951fb908fcdaa3c8490803ac7459dfc0a5.tar.gz |
Merge branch 'master' into jwi-implreprestart-889
18 files changed, 9 insertions, 81 deletions
diff --git a/TAO/MPC/config/security.mpb b/TAO/MPC/config/security.mpb index f46210cc5ac..3cec6a9cb93 100644 --- a/TAO/MPC/config/security.mpb +++ b/TAO/MPC/config/security.mpb @@ -1,5 +1,5 @@ // -*- MPC -*- -project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi { +project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi, svc_utils { after += Security libs += TAO_Security tagchecks += Security diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc index 2be113473a0..d8f64729057 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc +++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc @@ -15,8 +15,6 @@ project(*Manager): orbsvcsexe, portableserver { ManagerC.cpp } Documentation_Files { - Advanced.mpc - run_test.pl README drivers/* } 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 <coryan@uci.edu> - */ 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 <coryan@uci.edu> - */ 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 <coryan@uci.edu> - */ - 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_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index da170a07a03..e037fbf7d54 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -21,19 +21,11 @@ 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_, 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> rtcorba_setup_; - auto_ptr<PriorityBand_Setup> priorityband_setup_; SyncScope_Setup syncscope_setup_; }; 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, 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 <coryan@uci.edu> - */ diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index ae1ffb5ac3d..77779743c07 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -30,15 +30,6 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba, Documentation_Files { README - FT_App.mpc - run_test_basic.pl // can the client talk to the server - run_test_detector.pl // does a detector notice a server fault - run_test_notifier.pl // does the notification get to an analyzer - run_test_fault_consumer.pl // Is the notification analyzed correctly - run_test_registry.pl // does the stand-along factory registry work - run_test_rmregistry.pl // does the factory registry in the RM work - run_test_replication_mgr.pl // - run_test_demo.pl // test it all together } IDL_Files { diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 601fedab6d9..ffdc04c1256 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,18 +116,6 @@ jobs: vcpkgarch: x64-windows vcpkglibdir: lib vcpkgpackages: openssl xerces-c - Debug32: - BuildPlatform: Win32 - BuildConfiguration: Debug - vcpkgarch: x86-windows - vcpkglibdir: debug\lib - vcpkgpackages: openssl xerces-c - Release32: - BuildPlatform: Win32 - BuildConfiguration: Release - vcpkgarch: x86-windows - vcpkglibdir: lib - vcpkgpackages: openssl xerces-c variables: VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include @@ -272,6 +260,12 @@ jobs: PackageDeps: clang-7 Repo: llvm-toolchain-$(lsb_release -cs)-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + CLANG8: + CC: clang-8 + CXX: clang++-8 + PackageDeps: clang-8 + Repo: llvm-toolchain-$(lsb_release -cs)-8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU steps: - script: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - |