Unverified Commit d06f64f6 authored by Gagik Vardanyan's avatar Gagik Vardanyan Committed by GitHub
Browse files

Merge pull request #32589 from DavidFair/Fix_broken_cppcheck

Fix broken cppcheck
parents a5345e68 afb531d3
......@@ -14,14 +14,12 @@ namespace Mantid::Kernel {
/** Default constructor
*/
DataItem::DataItem() { m_lock = std::make_unique<Poco::RWLock>(); }
DataItem::DataItem() : m_lock(std::make_unique<Poco::RWLock>()) {}
/** Copy constructor
* Always makes a unique lock
*/
DataItem::DataItem(const DataItem & /*other*/) {
// Always make a unique lock!
m_lock = std::make_unique<Poco::RWLock>();
}
DataItem::DataItem(const DataItem & /*other*/) : m_lock(std::make_unique<Poco::RWLock>()) {}
/**
* Destructor. Required in cpp do avoid linker errors when other projects try to
......
......@@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
# If errors slip through to master this can be used to set a non-zero
# allowed count while those errors are dealt with. This avoids breaking all
# builds for all developers
ALLOWED_ERRORS_COUNT=1069
ALLOWED_ERRORS_COUNT=1067
if [[ ${JOB_NAME} == *pull_requests* ]]; then
# This relies on the fact pull requests use pull/$PR-NAME
......@@ -32,7 +32,7 @@ if [ $(command -v scl) ]; then
SCL_ENABLE="scl enable devtoolset-7"
else
CMAKE_EXE=cmake
SCL_ENABLE=""
SCL_ENABLE="eval"
fi
$SCL_ENABLE "$CMAKE_EXE --version"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment