Make Use of opendds_uses_cxx11

iguessthislldo · Mar 7, 2024 · 15a6c96 · 15a6c96
1 parent 42f2e16
commit 15a6c96
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 21 deletions.
diff --git a/performance-tests/bench/bench_builder_exe.mpb b/performance-tests/bench/bench_builder_exe.mpb
@@ -1,5 +1,4 @@
 project: ../bench_builder_idl_lib, dcps_inforepodiscovery {
-  avoids += no_cxx11
   after    += Bench_Builder
   libs     += Bench_Builder
   expand(BENCH_BUILDER_ROOT) {

diff --git a/performance-tests/bench/bench_builder_idl_lib.mpb b/performance-tests/bench/bench_builder_idl_lib.mpb
@@ -1,5 +1,4 @@
-project: dcps_rtps_udp {
-  avoids += no_cxx11
+project: dcps_rtps_udp, opendds_uses_cxx11 {
   after    += Bench_Builder_Idl
   libs     += Bench_Builder_Idl
   expand(BENCH_BUILDER_ROOT) {

diff --git a/performance-tests/bench/bench_exe.mpb b/performance-tests/bench/bench_exe.mpb
@@ -1,5 +1,4 @@
-project: dcps_rtps_udp, dcps_ts_defaults, rapidjson {
-  avoids += no_cxx11
+project: dcps_rtps_udp, dcps_ts_defaults, rapidjson, opendds_uses_cxx11 {
   after    += Bench_Common Bench_Idl Bench_Builder Bench_Builder_Idl
   libs     += Bench_Common Bench_Idl Bench_Builder Bench_Builder_Idl
   expand(BENCH_ROOT) {

diff --git a/performance-tests/bench/bench_idl_lib.mpb b/performance-tests/bench/bench_idl_lib.mpb
@@ -1,5 +1,4 @@
-project: dcps_rtps_udp {
-  avoids += no_cxx11
+project: dcps_rtps_udp, opendds_uses_cxx11 {
   after    += Bench_Idl
   libs     += Bench_Idl
   expand(BENCH_ROOT) {

diff --git a/performance-tests/bench/builder/Bench_Builder.mpc b/performance-tests/bench/builder/Bench_Builder.mpc
@@ -1,5 +1,4 @@
 project: dcps, dcps_inforepodiscovery, ../bench_builder_idl_lib {
-  avoids += no_cxx11
   dynamicflags += BENCH_BUILDER_BUILD_DLL
   libout = $(BENCH_BUILDER_ROOT)/lib
 }
diff --git a/performance-tests/bench/common/Bench_Common.mpc b/performance-tests/bench/common/Bench_Common.mpc
@@ -1,6 +1,4 @@
 project: dcps, ../bench_idl_lib, ../bench_builder_idl_lib, dcps_ts_defaults, rapidjson {
-  avoids += no_cxx11
-
   after    += Bench_Builder
   libs     += Bench_Builder
 

diff --git a/tests/DCPS/C++11/Messenger/Publisher/DDS_Cxx11_Messenger_Publisher.mpc b/tests/DCPS/C++11/Messenger/Publisher/DDS_Cxx11_Messenger_Publisher.mpc
@@ -1,6 +1,4 @@
-project: dcpsexe, dcps_test, dcps_transports_for_test{
-  avoids   += no_cxx11
-  requires += no_opendds_safety_profile
+project: dcpsexe, dcps_test, dcps_transports_for_test, opendds_uses_cxx11 {
   exename   = publisher
   after    += DDS_Cxx11_Messenger_Idl
   libs     += DDS_Cxx11_Messenger_Idl

diff --git a/tests/DCPS/C++11/Messenger/Subscriber/DDS_Cxx11_Messenger_Subscriber.mpc b/tests/DCPS/C++11/Messenger/Subscriber/DDS_Cxx11_Messenger_Subscriber.mpc
@@ -1,6 +1,4 @@
-project: dcpsexe, dcps_test, dcps_transports_for_test{
-  avoids   += no_cxx11
-  requires += no_opendds_safety_profile
+project: dcpsexe, dcps_test, dcps_transports_for_test, opendds_uses_cxx11 {
   exename   = subscriber
   after    += DDS_Cxx11_Messenger_Idl
   libs     += DDS_Cxx11_Messenger_Idl

diff --git a/tests/DCPS/Compiler/vread_vwrite/VreadVwriteTest.mpc b/tests/DCPS/Compiler/vread_vwrite/VreadVwriteTest.mpc
@@ -1,11 +1,7 @@
-project: dcpsexe, dcps_test, googletest, rapidjson {
-
+project: dcpsexe, dcps_test, googletest, rapidjson, opendds_uses_cxx11 {
   dcps_ts_flags += -Gxtypes-complete
   exename = *
 
-  requires += no_opendds_safety_profile
-  avoids += no_cxx11
-
   Idl_Files {
     VreadVwriteTest.idl
   }