Fix unit tests and prevent warnings

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index cf63eaff7c7cb27ae0b2ec451801bda05b23677d..90556a08526f04fd021a4591b915c07d43c1cf73 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -30,9 +30,9 @@
 #include <pv/util.hpp>
 
 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 21a32c5ebb3233760beced2a304bfecec5a7367f..9e4a99c39d93cac2d1392bf32cab47ed1c701255 100644 (file)
--- 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)