From 5d6ae8a26c8d86531d0d85d2fefc67d617c73f56 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Sun, 31 Jan 2016 18:06:07 +0100 Subject: [PATCH] Fix unit tests and prevent warnings --- pv/view/ruler.hpp | 12 ++++++------ test/util.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp index cf63eaff..90556a08 100644 --- a/pv/view/ruler.hpp +++ b/pv/view/ruler.hpp @@ -30,9 +30,9 @@ #include namespace RulerTest { -class tick_position_test_0; -class tick_position_test_1; -class tick_position_test_2; +struct tick_position_test_0; +struct tick_position_test_1; +struct tick_position_test_2; } namespace pv { @@ -45,9 +45,9 @@ class Ruler : public MarginWidget { Q_OBJECT - friend class RulerTest::tick_position_test_0; - friend class RulerTest::tick_position_test_1; - friend class RulerTest::tick_position_test_2; + friend struct RulerTest::tick_position_test_0; + friend struct RulerTest::tick_position_test_1; + friend struct RulerTest::tick_position_test_2; private: diff --git a/test/util.cpp b/test/util.cpp index 21a32c5e..9e4a99c3 100644 --- a/test/util.cpp +++ b/test/util.cpp @@ -32,13 +32,13 @@ namespace { pv::util::SIPrefix unspecified = pv::util::SIPrefix::unspecified; pv::util::SIPrefix yocto = pv::util::SIPrefix::yocto; pv::util::SIPrefix nano = pv::util::SIPrefix::nano; - pv::util::SIPrefix micro = pv::util::SIPrefix::micro; +/* pv::util::SIPrefix micro = pv::util::SIPrefix::micro; // Not currently used */ pv::util::SIPrefix milli = pv::util::SIPrefix::milli; pv::util::SIPrefix none = pv::util::SIPrefix::none; pv::util::SIPrefix kilo = pv::util::SIPrefix::kilo; pv::util::SIPrefix yotta = pv::util::SIPrefix::yotta; - pv::util::TimeUnit Time = pv::util::TimeUnit::Time; +/* pv::util::TimeUnit Time = pv::util::TimeUnit::Time; // Not currently used */ } BOOST_AUTO_TEST_SUITE(UtilTest) -- 2.30.2