From ca1b2fc51540b4fcb2cd0b4fccaa33b02738af41 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Tue, 14 Sep 2021 13:30:54 +0200 Subject: [PATCH] linters: fix clang-check-12 --- .gitignore | 3 +- include/dynamic-graph/eigen-io.h | 10 +++--- include/dynamic-graph/linear-algebra.h | 3 -- tests/interpreter-tracer.cpp | 42 -------------------------- tests/signal-cast-register-test.h | 3 -- tests/signal-ptr.cpp | 2 +- 6 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 tests/interpreter-tracer.cpp diff --git a/.gitignore b/.gitignore index 22cf052..c2fcf5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ _build* -*~ \ No newline at end of file +.~ +compile_commands.json diff --git a/include/dynamic-graph/eigen-io.h b/include/dynamic-graph/eigen-io.h index 2d3f900..493c2f6 100644 --- a/include/dynamic-graph/eigen-io.h +++ b/include/dynamic-graph/eigen-io.h @@ -7,15 +7,13 @@ #ifndef DYNAMIC_GRAPH_EIGEN_IO_H #define DYNAMIC_GRAPH_EIGEN_IO_H -#include <boost/format.hpp> -#include <boost/numeric/conversion/cast.hpp> -#pragma GCC diagnostic push -#pragma GCC system_header -#include <Eigen/Geometry> -#pragma GCC diagnostic pop #include <dynamic-graph/exception-signal.h> #include <dynamic-graph/linear-algebra.h> +#include <Eigen/Geometry> +#include <boost/format.hpp> +#include <boost/numeric/conversion/cast.hpp> + using dynamicgraph::ExceptionSignal; // TODO: Eigen 3.3 onwards has a global Eigen::Index definition. diff --git a/include/dynamic-graph/linear-algebra.h b/include/dynamic-graph/linear-algebra.h index 4a3b256..c600ff1 100644 --- a/include/dynamic-graph/linear-algebra.h +++ b/include/dynamic-graph/linear-algebra.h @@ -6,11 +6,8 @@ #ifndef DYNAMIC_GRAPH_LINEAR_ALGEBRA_H #define DYNAMIC_GRAPH_LINEAR_ALGEBRA_H -#pragma GCC diagnostic push -#pragma GCC system_header #include <Eigen/Core> #include <Eigen/Geometry> -#pragma GCC diagnostic pop namespace dynamicgraph { typedef Eigen::MatrixXd Matrix; diff --git a/tests/interpreter-tracer.cpp b/tests/interpreter-tracer.cpp deleted file mode 100644 index 4d1207d..0000000 --- a/tests/interpreter-tracer.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2010 Thomas Moulard. -// - -#include <dynamic-graph/exception-factory.h> -#include <dynamic-graph/interpreter.h> -#include <dynamic-graph/plugin-loader.h> - -#include <sstream> - -#define BOOST_TEST_MODULE tracer - -#if BOOST_VERSION >= 105900 -#include <boost/test/tools/output_test_stream.hpp> -#else -#include <boost/test/output_test_stream.hpp> -#endif -#include <boost/test/unit_test.hpp> - -#include "interpreter.h" - -using boost::test_tools::output_test_stream; - -// Check that plug-in loading/unloading is working. -BOOST_AUTO_TEST_CASE(cmd_tracer) { - dynamicgraph::PluginLoader pl; - - // Push paths. - { - RUN_COMMAND("pushImportPaths", TESTS_DATADIR); - BOOST_CHECK(output.is_empty()); - } - { - RUN_COMMAND("pushImportPaths", TESTS_PLUGINDIR); - BOOST_CHECK(output.is_empty()); - } - - // Import tracer.dg - { - RUN_COMMAND("import", "interpreter-tracer.dg"); - BOOST_CHECK(output.is_empty()); - } -} diff --git a/tests/signal-cast-register-test.h b/tests/signal-cast-register-test.h index 1d466c1..ab76dd2 100644 --- a/tests/signal-cast-register-test.h +++ b/tests/signal-cast-register-test.h @@ -1,4 +1 @@ -#pragma GCC diagnostic push -#pragma GCC system_header #include <Eigen/Dense> -#pragma GCC diagnostic pop diff --git a/tests/signal-ptr.cpp b/tests/signal-ptr.cpp index 2fc5447..96d520f 100644 --- a/tests/signal-ptr.cpp +++ b/tests/signal-ptr.cpp @@ -317,6 +317,6 @@ BOOST_AUTO_TEST_CASE(set_signal_string) { s.set(value); } catch (const std::exception &exc) { std::cout << exc.what() << std::endl; - BOOST_CHECK(!"Tentative to set signal to empty string"); + BOOST_CHECK(!(bool)("Tentative to set signal to empty string")); } } -- GitLab