Skip to content

Commit acc690a

Browse files
authored
Prevent SonarCloud warning (#506)
1 parent 3313b34 commit acc690a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ jobs:
9494
# Consult https://docs.sonarsource.com/sonarqube-server/latest/analyzing-source-code/scanners/sonarscanner/ for more information and options
9595
args: >
9696
--define sonar.host.url="${{ env.SONAR_SERVER_URL }}"
97-
--define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
97+
--define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
9898
--define sonar.coverageReportPaths=build/coverage.xml
9999

src/main/include/log4cxx/helpers/singletonholder.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ class SingletonHolder : public Object
4444

4545
public: // ...structors
4646
SingletonHolder() {}
47-
template <typename ... Args>
48-
SingletonHolder(Args&& ... args)
49-
: m_data(std::forward<Args>(args) ... )
47+
template < typename Arg0, typename ... Args
48+
, typename = typename std::enable_if<!std::is_same<typename std::decay<Arg0>::type, SingletonHolder>::value>::type
49+
>
50+
SingletonHolder(Arg0 arg0, Args&& ... args)
51+
: m_data(arg0, std::forward<Args>(args) ... )
5052
{}
51-
// Prevent copying
52-
SingletonHolder(const SingletonHolder&) = delete;
53-
SingletonHolder(SingletonHolder&&) = delete;
53+
// Prevent copying
54+
SingletonHolder(const SingletonHolder&) = delete;
55+
SingletonHolder(SingletonHolder&&) = delete;
5456

5557
public: // Accessors
5658
T& value() { return m_data; }

0 commit comments

Comments
 (0)