Skip to content

Fix error: template-id not allowed for constructor and some Doxygen errors #2012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 27, 2025
Merged

Fix error: template-id not allowed for constructor and some Doxygen errors #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4541ce9
Remove some duplicate test category config
peternewman Jun 25, 2025
c4a10f9
Fix error: template-id not allowed for constructor in C++20
kiilerix Sep 7, 2024
ede6472
Fix a number of new cpplint errors
peternewman Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions common/io/SelectServerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions common/testing/GenericTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
#include <iostream>
#include <string>

#include "ola/base/Env.h"
Expand Down
2 changes: 2 additions & 0 deletions doxygen/examples/callback_client_transmit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <ola/client/ClientWrapper.h>
#include <ola/Callback.h>

#include <iostream>

using std::cout;
using std::endl;

Expand Down
2 changes: 2 additions & 0 deletions doxygen/examples/client_disconnect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <ola/client/ClientWrapper.h>
#include <ola/Callback.h>

#include <iostream>

using std::cout;
using std::endl;

Expand Down
1 change: 1 addition & 0 deletions doxygen/examples/client_thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <ola/thread/Thread.h>
#include <ola/Callback.h>

#include <iostream>
#include <vector>

#ifdef _WIN32
Expand Down
1 change: 1 addition & 0 deletions doxygen/examples/fetch_plugins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <ola/client/ClientWrapper.h>
#include <ola/Callback.h>

#include <iostream>
#include <vector>

using std::cout;
Expand Down
2 changes: 2 additions & 0 deletions doxygen/examples/legacy_callback_client_transmit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <ola/OlaClientWrapper.h>
#include <ola/Callback.h>

#include <iostream>

using std::cout;
using std::endl;

Expand Down
1 change: 1 addition & 0 deletions examples/ola-dmxconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#include <ola/client/OlaClient.h>
#include <ola/io/SelectServer.h>

#include <iostream>
#include <string>

using ola::client::OlaClient;
Expand Down
4 changes: 2 additions & 2 deletions include/ola/thread/FuturePrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class FutureImpl {
bool m_is_set;
T m_value;

DISALLOW_COPY_AND_ASSIGN(FutureImpl<T>);
DISALLOW_COPY_AND_ASSIGN(FutureImpl);
};

/**
Expand Down Expand Up @@ -152,7 +152,7 @@ class FutureImpl<void> {
unsigned int m_ref_count;
bool m_is_set;

DISALLOW_COPY_AND_ASSIGN(FutureImpl<void>);
DISALLOW_COPY_AND_ASSIGN(FutureImpl);
};

} // namespace thread
Expand Down
1 change: 1 addition & 0 deletions libs/usb/JaRuleWidgetPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <ola/thread/Mutex.h>
#include <ola/util/Utils.h>

#include <iostream>
#include <memory>
#include <string>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion plugins/usbdmx/WidgetFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class BaseWidgetFactory : public WidgetFactory {
private:
const std::string m_name;

DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory<WidgetType>);
DISALLOW_COPY_AND_ASSIGN(BaseWidgetFactory);
};

template <typename WidgetType>
Expand Down
2 changes: 0 additions & 2 deletions tools/rdm/TestDefinitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ class DUBSingleLowerUID(TestMixins.DiscoveryMixin,
ResponderTestFixture):
"""DUB from <UID> - 1 to <UID> - 1."""
CATEGORY = TestCategory.NETWORK_MANAGEMENT
CATEGORY = TestCategory.NETWORK_MANAGEMENT
REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES

def LowerBound(self):
Expand All @@ -286,7 +285,6 @@ class DUBSingleUpperUID(TestMixins.DiscoveryMixin,
ResponderTestFixture):
"""DUB from <UID> + 1 to <UID> + 1."""
CATEGORY = TestCategory.NETWORK_MANAGEMENT
CATEGORY = TestCategory.NETWORK_MANAGEMENT
REQUIRES = ['dub_supported'] + TestMixins.DiscoveryMixin.REQUIRES

def LowerBound(self):
Expand Down
Loading