Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion TestFramework.project
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ mkdir -p coverage && cd coverage
find .. -name '*.gcda' | xargs gcov -abcfmu
find . -type f -not -name 'Test*.gcov' | xargs rm</Target>
<Target Name="cppcheck">cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -Wno-dev
cppcheck --project=compile_commands.json -itest -idemo --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction</Target>
cppcheck --project=compile_commands.json --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --std=c++11 --inline-suppr</Target>
<Target Name="cpack">cpack --config CPackConfig.cmake
cpack --config CPackSourceConfig.cmake
cpack -G DEB
Expand Down
8 changes: 4 additions & 4 deletions include/internal/TestCPPExceptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ namespace TestCPP {
* Construct an exception of this type with a string literal for
* its failure message.
*/
TestCPPException (const char * msg);
explicit TestCPPException (const char * msg);

/**
* Construct an exception of this type with a string object for
* its failure message.
*/
TestCPPException (string&& msg);
explicit TestCPPException (string&& msg);
};

/**
Expand All @@ -89,13 +89,13 @@ namespace TestCPP {
* Construct an exception of this type with a string literal for
* its failure message.
*/
TestFailedException (const char * msg);
explicit TestFailedException (const char * msg);

/**
* Construct an exception of this type with a string literal for
* its failure message.
*/
TestFailedException (string&& msg);
explicit TestFailedException (string&& msg);
};
}

Expand Down
5 changes: 5 additions & 0 deletions include/internal/TestCPPUtil.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ namespace TestCPP {
* @return The TestObjName, where it is verified that the name
* used to construct it was not null.
*/
//
// This is intended to be used for implicit conversions and copy
// initialization.
//
// cppcheck-suppress noExplicitConstructor
TestObjName (const char* name);

/**
Expand Down