Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
025754c9
Unverified
Commit
025754c9
authored
Sep 10, 2021
by
Peterson, Peter
Committed by
GitHub
Sep 10, 2021
Browse files
Merge pull request #32456 from peterfpeterson/set_cppcheck_std
Set c++ standard for cppcheck to validate against (ornlnext)
parents
2fb97c02
f56a1c0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
View file @
025754c9
...
...
@@ -66,7 +66,7 @@ private:
void
setTimeSeriesData
(
API
::
Run
&
run_obj
,
const
std
::
string
&
property_name
,
bool
value_is_int
);
/// get run start time
Types
::
Core
::
DateAndTime
getRunStart
(
API
::
Run
&
run_obj
);
Types
::
Core
::
DateAndTime
getRunStart
(
const
API
::
Run
&
run_obj
);
/// get value vector of the integer TimeSeriesProperty entries
std
::
vector
<
int
>
getIntValues
(
const
API
::
MatrixWorkspace_const_sptr
&
dataws
,
int
workspace_index
);
...
...
Framework/Algorithms/src/AddSampleLog.cpp
View file @
025754c9
...
...
@@ -365,7 +365,7 @@ std::vector<Types::Core::DateAndTime> AddSampleLog::getTimes(const API::MatrixWo
* @param run_obj
* @return
*/
Types
::
Core
::
DateAndTime
AddSampleLog
::
getRunStart
(
API
::
Run
&
run_obj
)
{
Types
::
Core
::
DateAndTime
AddSampleLog
::
getRunStart
(
const
API
::
Run
&
run_obj
)
{
// TODO/ISSUE/NOW - data ws should be the target workspace with run_start or
// proton_charge property!
Types
::
Core
::
DateAndTime
runstart
(
0
);
...
...
buildconfig/CMake/CppCheckSetup.cmake
View file @
025754c9
...
...
@@ -10,6 +10,7 @@ if ( CPPCHECK_EXECUTABLE )
# setup the standard arguments
# --inline-suppr appears to be ignored if --suppresions-list is specified
set
(
CPPCHECK_ARGS --enable=all --inline-suppr --max-configs=120
--std=c++
${
CMAKE_CXX_STANDARD
}
# use the standard from cmake
--suppressions-list=
${
CMAKE_BINARY_DIR
}
/CppCheck_Suppressions.txt
--project=
${
CMAKE_BINARY_DIR
}
/compile_commands.json
# Force cppcheck to check when we use project-wide macros
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment