diff options
| -rw-r--r-- | Jamroot.jam | 2 | ||||
| -rw-r--r-- | slicer/test/compilation.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index c1df266..e1ec381 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -78,5 +78,5 @@ project slicer : requirements build-project slicer ; pkg-config.import libxmlpp : : <name>libxml++-5.0 ; -pkg-config.import glibmm : : <name>glibmm-2.4 ; +pkg-config.import glibmm : : <name>glibmm-2.68 ; diff --git a/slicer/test/compilation.cpp b/slicer/test/compilation.cpp index 8521643..1893255 100644 --- a/slicer/test/compilation.cpp +++ b/slicer/test/compilation.cpp @@ -22,6 +22,9 @@ BOOST_TEST_DONT_PRINT_LOG_VALUE(std::type_info) BOOST_TEST_DONT_PRINT_LOG_VALUE(Slicer::ModelPartType) // LCOV_EXCL_STOP +// Nesting BOOST_TEST_CONTEXT causes shadowing +#pragma clang diagnostic ignored "-Wshadow" + #define TypeTest(Var, Expr, Explicit, Expected, ...) \ Var obj = Expr; \ Slicer::ModelPart::CreateFor(&obj, [](auto && mpp) { \ |