diff --git a/include/PropertyDescription.h b/include/PropertyDescription.h index 1debe7446576a7f4084cdba9e166016b98a3e1fd..1b18c3166fb83c78c8b177958981d950f554bfa8 100644 --- a/include/PropertyDescription.h +++ b/include/PropertyDescription.h @@ -251,7 +251,7 @@ namespace ChimeraTK { IiiiDescription(ChimeraTK::RegisterPath const& iiiiSource_ = "", std::string const& location_ = "", std::string const& name_ = "") - : PropertyDescription(location_, name_), iiiiSource(iiiiSource_){}; + : PropertyDescription(location_, name_), iiiiSource(iiiiSource_) {}; void print(std::ostream& os = std::cout) const override { os << "iiii: " << iiiiSource << " -> " << location << " / " << name << std::endl; diff --git a/tests/include/serverBasedTestTools.h b/tests/include/serverBasedTestTools.h index c41e6922041a91fc51c01382bca8576c5f62c897..44613386b1aab650f7c1b9b59de43c7e228a36fa 100644 --- a/tests/include/serverBasedTestTools.h +++ b/tests/include/serverBasedTestTools.h @@ -15,7 +15,9 @@ static const int ACCESS_RW = 1; // read/write #define DOOCS_ADAPTER_DEFAULT_FIXTURE \ struct GlobalFixture { \ - GlobalFixture() { ChimeraTK::DoocsAdapter::waitUntilInitialised(); } \ + GlobalFixture() { \ + ChimeraTK::DoocsAdapter::waitUntilInitialised(); \ + } \ \ static ExtendedTestApplication referenceTestApplication; \ ThreadedDoocsServer server{boost::unit_test::framework::master_test_suite().p_name.value + ".conf", \ @@ -38,7 +40,9 @@ static const int ACCESS_RW = 1; // read/write codeBlockStartUp \ } \ \ - ~GlobalFixture() { GlobalFixture::referenceTestApplication.releaseManualLoopControl(); } \ + ~GlobalFixture() { \ + GlobalFixture::referenceTestApplication.releaseManualLoopControl(); \ + } \ \ static ExtendedTestApplication referenceTestApplication; \ static std::string rpcNo; \ diff --git a/tests/src/serverTestIfff.cpp b/tests/src/serverTestIfff.cpp index a3a9c0bf76cc9149f37920001eae757b79237740..1753055f717dde2d8718fff47b23e8df87ea9982 100644 --- a/tests/src/serverTestIfff.cpp +++ b/tests/src/serverTestIfff.cpp @@ -36,8 +36,7 @@ BOOST_AUTO_TEST_CASE(testIfffUpdate) { IFFF value; // a copy of the value. We don't want to hold the location lock longer than needed location->lock(); - value = *( - d_ifff + value = *(d_ifff ->value()); // value returs a pointer which we only must dereference while holding the lock. So we make a copy location->unlock(); return value; diff --git a/tests/src/testVariableMapper.cpp b/tests/src/testVariableMapper.cpp index 310d7185188db8d1068c16125ba039308a37d34f..573ed5b8b8b7c228ee19a1e674efe1f51b9e83af 100644 --- a/tests/src/testVariableMapper.cpp +++ b/tests/src/testVariableMapper.cpp @@ -6,7 +6,7 @@ #include <boost/test/included/unit_test.hpp> #include <utility> -//#include <boost/test/test_case_template.hpp> +// #include <boost/test/test_case_template.hpp> #include "VariableMapper.h" using namespace ChimeraTK;