From 4541ce992feb0a3eeb53922ac22a787ae8fb6fd6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 25 Jun 2025 23:30:38 +0100 Subject: [PATCH 1/3] Remove some duplicate test category config --- tools/rdm/TestDefinitions.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py index 4e724d4e1..c12baa78b 100644 --- a/tools/rdm/TestDefinitions.py +++ b/tools/rdm/TestDefinitions.py @@ -269,7 +269,6 @@ class DUBSingleLowerUID(TestMixins.DiscoveryMixin, ResponderTestFixture): """DUB from - 1 to - 1.""" CATEGORY = TestCategory.NETWORK_MANAGEMENT - CATEGORY = TestCategory.NETWORK_MANAGEMENT REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES def LowerBound(self): @@ -286,7 +285,6 @@ class DUBSingleUpperUID(TestMixins.DiscoveryMixin, ResponderTestFixture): """DUB from + 1 to + 1.""" CATEGORY = TestCategory.NETWORK_MANAGEMENT - CATEGORY = TestCategory.NETWORK_MANAGEMENT REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES def LowerBound(self): From c4a10f945bfb85959cab459fdd2c1a62eccb112e Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 7 Sep 2024 11:34:25 +0200 Subject: [PATCH 2/3] Fix error: template-id not allowed for constructor in C++20 Building ola fails on Fedora with GCC-14: In file included from ./include/ola/Clock.h:32: ./include/ola/base/Macro.h:45:11: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor] 45 | TypeName(const TypeName&); \ | ^ ./include/ola/thread/FuturePrivate.h:92:3: note: in expansion of macro 'DISALLOW_COPY_AND_ASSIGN' 92 | DISALLOW_COPY_AND_ASSIGN(FutureImpl); | ^~~~~~~~~~~~~~~~~~~~~~~~ ./include/ola/base/Macro.h:45:11: note: remove the '< >' 45 | TypeName(const TypeName&); \ | ^ When a class already is templatified, the templification can't be repeated on contained methods. (cherry picked from commit d9b9c78645c578adb7c07b692842e841c48310be) --- include/ola/thread/FuturePrivate.h | 4 ++-- plugins/usbdmx/WidgetFactory.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ola/thread/FuturePrivate.h b/include/ola/thread/FuturePrivate.h index e2f065fb9..56bda8715 100644 --- a/include/ola/thread/FuturePrivate.h +++ b/include/ola/thread/FuturePrivate.h @@ -89,7 +89,7 @@ class FutureImpl { bool m_is_set; T m_value; - DISALLOW_COPY_AND_ASSIGN(FutureImpl); + DISALLOW_COPY_AND_ASSIGN(FutureImpl); }; /** @@ -152,7 +152,7 @@ class FutureImpl { unsigned int m_ref_count; bool m_is_set; - DISALLOW_COPY_AND_ASSIGN(FutureImpl); + DISALLOW_COPY_AND_ASSIGN(FutureImpl); }; } // namespace thread diff --git a/plugins/usbdmx/WidgetFactory.h b/plugins/usbdmx/WidgetFactory.h index fc65600f3..1231404e4 100644 --- a/plugins/usbdmx/WidgetFactory.h +++ b/plugins/usbdmx/WidgetFactory.h @@ -172,7 +172,7 @@ class BaseWidgetFactory : public WidgetFactory { private: const std::string m_name; - DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory); + DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory); }; template From ede6472d1866ba520acdf8d247d7411a859771e7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 26 Jun 2025 23:36:36 +0100 Subject: [PATCH 3/3] Fix a number of new cpplint errors --- common/io/SelectServerTest.cpp | 7 +++++-- common/testing/GenericTester.cpp | 1 + doxygen/examples/callback_client_transmit.cpp | 2 ++ doxygen/examples/client_disconnect.cpp | 2 ++ doxygen/examples/client_thread.cpp | 1 + doxygen/examples/fetch_plugins.cpp | 1 + doxygen/examples/legacy_callback_client_transmit.cpp | 2 ++ examples/ola-dmxconsole.cpp | 1 + libs/usb/JaRuleWidgetPort.cpp | 1 + 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/common/io/SelectServerTest.cpp b/common/io/SelectServerTest.cpp index 6e905c2ac..51d39d9a5 100644 --- a/common/io/SelectServerTest.cpp +++ b/common/io/SelectServerTest.cpp @@ -122,7 +122,9 @@ class SelectServerTest: public CppUnit::TestFixture { void Terminate() { OLA_DEBUG << "Terminate called"; - if (m_ss) { m_ss->Terminate(); } + if (m_ss) { + m_ss->Terminate(); + } } void SingleIncrementTimeout() { @@ -147,8 +149,9 @@ class SelectServerTest: public CppUnit::TestFixture { void NullHandler() {} bool IncrementTimeout() { - if (m_ss && m_ss->IsRunning()) + if (m_ss && m_ss->IsRunning()) { m_timeout_counter++; + } return true; } diff --git a/common/testing/GenericTester.cpp b/common/testing/GenericTester.cpp index 19c8d0b26..0728b6fc4 100644 --- a/common/testing/GenericTester.cpp +++ b/common/testing/GenericTester.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "ola/base/Env.h" diff --git a/doxygen/examples/callback_client_transmit.cpp b/doxygen/examples/callback_client_transmit.cpp index 2f8c9fa72..e5aa943f9 100644 --- a/doxygen/examples/callback_client_transmit.cpp +++ b/doxygen/examples/callback_client_transmit.cpp @@ -22,6 +22,8 @@ #include #include +#include + using std::cout; using std::endl; diff --git a/doxygen/examples/client_disconnect.cpp b/doxygen/examples/client_disconnect.cpp index 1d2b9bffb..2e8566cf9 100644 --- a/doxygen/examples/client_disconnect.cpp +++ b/doxygen/examples/client_disconnect.cpp @@ -23,6 +23,8 @@ #include #include +#include + using std::cout; using std::endl; diff --git a/doxygen/examples/client_thread.cpp b/doxygen/examples/client_thread.cpp index 96aaa122c..10415c24b 100644 --- a/doxygen/examples/client_thread.cpp +++ b/doxygen/examples/client_thread.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #ifdef _WIN32 diff --git a/doxygen/examples/fetch_plugins.cpp b/doxygen/examples/fetch_plugins.cpp index 562542ccd..78a7e5c76 100644 --- a/doxygen/examples/fetch_plugins.cpp +++ b/doxygen/examples/fetch_plugins.cpp @@ -21,6 +21,7 @@ #include #include +#include #include using std::cout; diff --git a/doxygen/examples/legacy_callback_client_transmit.cpp b/doxygen/examples/legacy_callback_client_transmit.cpp index 30d090cfd..5279cf218 100644 --- a/doxygen/examples/legacy_callback_client_transmit.cpp +++ b/doxygen/examples/legacy_callback_client_transmit.cpp @@ -22,6 +22,8 @@ #include #include +#include + using std::cout; using std::endl; diff --git a/examples/ola-dmxconsole.cpp b/examples/ola-dmxconsole.cpp index 5b2de0686..57642cb20 100644 --- a/examples/ola-dmxconsole.cpp +++ b/examples/ola-dmxconsole.cpp @@ -56,6 +56,7 @@ #include #include +#include #include using ola::client::OlaClient; diff --git a/libs/usb/JaRuleWidgetPort.cpp b/libs/usb/JaRuleWidgetPort.cpp index c130732f8..ff69f7f71 100644 --- a/libs/usb/JaRuleWidgetPort.cpp +++ b/libs/usb/JaRuleWidgetPort.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include #include