diff --git a/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch b/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch deleted file mode 100644 index 7bc8a85..0000000 --- a/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch +++ /dev/null @@ -1,71 +0,0 @@ -From e565d7fb4d9d83884afd38e89864b597241d00eb Mon Sep 17 00:00:00 2001 -From: Jan Vermaete -Date: Sat, 30 Dec 2023 14:30:02 +0100 -Subject: [PATCH 2/2] fixing DoAll -> testing::DoAll - -| ...3.26.1/recipe-sysroot/usr/include/gmock/gmock-actions.h:1783:61: note: 'testing::DoAll' declared here -| 1783 | internal::DoAllAction::type...> DoAll( -| | ^~~~~ - -Upstream-Status: Accepted [https://github.com/OpenDDS/OpenDDS/commit/cccdfcf53857e75ec479a0465a1318b669951290] - -Signed-off-by: Jan Vermaete ---- - tests/unit-tests/dds/DCPS/Qos_Helper.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/unit-tests/dds/DCPS/Qos_Helper.cpp b/tests/unit-tests/dds/DCPS/Qos_Helper.cpp -index 53e2cb30d..0d6cb1c55 100644 ---- a/tests/unit-tests/dds/DCPS/Qos_Helper.cpp -+++ b/tests/unit-tests/dds/DCPS/Qos_Helper.cpp -@@ -1457,7 +1457,7 @@ TEST(dds_DCPS_Qos_Helper, DataWriterQosBuilder_Publisher_ctor) - qos.reliability_best_effort(); - OpenDDS::DCPS::RcHandle publisher = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*publisher, get_default_datawriter_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); - DDS::Publisher_var publisher_var = DDS::Publisher::_duplicate(publisher.in()); - OpenDDS::DCPS::DataWriterQosBuilder uut(publisher_var); - EXPECT_EQ(qos, uut); -@@ -1513,12 +1513,12 @@ TEST(dds_DCPS_Qos_Helper, DataWriterQosBuilder_Topic_ctor) - - OpenDDS::DCPS::RcHandle topic = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*topic, get_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); - DDS::Topic_var topic_var = DDS::Topic::_duplicate(topic.in()); - - OpenDDS::DCPS::RcHandle publisher = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*publisher, get_default_datawriter_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(datawriter_qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(datawriter_qos.qos()), testing::Return(DDS::RETCODE_OK))); - EXPECT_CALL(*publisher, copy_from_topic_qos(testing::_, testing::_)) - .WillOnce(testing::DoAll(testing::Invoke(copy_from_topic1), testing::Return(DDS::RETCODE_OK))); - DDS::Publisher_var publisher_var = DDS::Publisher::_duplicate(publisher.in()); -@@ -1927,7 +1927,7 @@ TEST(dds_DCPS_Qos_Helper, DataReaderQosBuilder_Subscriber_ctor) - qos.reliability_best_effort(); - OpenDDS::DCPS::RcHandle subscriber = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*subscriber, get_default_datareader_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); - DDS::Subscriber_var subscriber_var = DDS::Subscriber::_duplicate(subscriber.in()); - OpenDDS::DCPS::DataReaderQosBuilder uut(subscriber_var); - EXPECT_EQ(qos, uut); -@@ -1979,12 +1979,12 @@ TEST(dds_DCPS_Qos_Helper, DataReaderQosBuilder_Topic_ctor) - - OpenDDS::DCPS::RcHandle topic = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*topic, get_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); - DDS::Topic_var topic_var = DDS::Topic::_duplicate(topic.in()); - - OpenDDS::DCPS::RcHandle subscriber = OpenDDS::DCPS::make_rch(); - EXPECT_CALL(*subscriber, get_default_datareader_qos(testing::_)) -- .WillOnce(DoAll(testing::SetArgReferee<0>(datareader_qos.qos()), testing::Return(DDS::RETCODE_OK))); -+ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(datareader_qos.qos()), testing::Return(DDS::RETCODE_OK))); - EXPECT_CALL(*subscriber, copy_from_topic_qos(testing::_, testing::_)) - .WillOnce(testing::DoAll(testing::Invoke(copy_from_topic2), testing::Return(DDS::RETCODE_OK))); - DDS::Subscriber_var subscriber_var = DDS::Subscriber::_duplicate(subscriber.in()); --- -2.39.2 - diff --git a/recipes-connectivity/opendds/opendds_3.26.1.bb b/recipes-connectivity/opendds/opendds_3.27.0.bb similarity index 82% rename from recipes-connectivity/opendds/opendds_3.26.1.bb rename to recipes-connectivity/opendds/opendds_3.27.0.bb index 0e9efc5..a032081 100644 --- a/recipes-connectivity/opendds/opendds_3.26.1.bb +++ b/recipes-connectivity/opendds/opendds_3.27.0.bb @@ -1,20 +1,19 @@ # Specify SHA-1 for the release to avoid constantly checking the upstream repo. -SRCREV = "3d7f89e8243fbf382ce6374f900489e76894d4f9" -DDS_SRC_BRANCH = "branch-DDS-3.26" +SRCREV = "6415d1750a65051fb1ee1c39a99a0915b7d3755b" +DDS_SRC_BRANCH = "branch-DDS-3.27" SRC_URI = "\ git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \ ${@bb.utils.contains('PACKAGECONFIG', 'ishapes', 'file://0001-adding-the-ishapes-demo.patch', '', d)} \ - file://0002-fixing-DoAll-testing-DoAll.patch \ " require opendds.inc DOC_TAO2_VERSION = "6.5.20" -DOC_TAO3_VERSION = "7.1.1" +DOC_TAO3_VERSION = "7.1.3" DOC_TAO2_SHA256SUM = "7546d11785dc7e03b578c82f39cc9ddb8b574685453e8479ac8765827e9936ad" -DOC_TAO3_SHA256SUM = "69ec3a8afffc16694a65550776b6fa8fc60846c5e3530bb7d74191bf4a43c711" +DOC_TAO3_SHA256SUM = "7d394cfcc71d0e90824fd1399f93640b4c9423016b88974ad3e4694c5301d96a" DOC_TAO2_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO2_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO2_VERSION}.tar.gz" DOC_TAO3_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO3_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO3_VERSION}.tar.gz"