X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=test%2Fview%2Fruler.cpp;h=4a4eac8f34d5822cacec1b622c4fe8c8f9f047bc;hb=941f20d1b75042b1c3f0b83a1e9d1acec5d231ef;hp=3984e973aa026af34fc8a3cfa1b66ce85eea3b50;hpb=866431680fdd701bfbfa5c128d7b116ea8d7d34d;p=pulseview.git diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp index 3984e973..4a4eac8f 100644 --- a/test/view/ruler.cpp +++ b/test/view/ruler.cpp @@ -17,7 +17,12 @@ * along with this program; if not, see . */ +#include +#if BOOST_VERSION >= 107100 // 1.71 deprecated the old header location. +#include +#else #include +#endif #include #include "pv/views/trace/ruler.hpp" @@ -44,7 +49,7 @@ BOOST_AUTO_TEST_CASE(tick_position_test_0) const int width(500); const unsigned int minor_tick_count(4); - const Ruler::TickPositions ts = Ruler::calculate_tick_positions( + const TickPositions ts = Ruler::calculate_tick_positions( major_period, offset, scale, width, minor_tick_count, format); BOOST_REQUIRE_EQUAL(ts.major.size(), 6); @@ -91,7 +96,7 @@ BOOST_AUTO_TEST_CASE(tick_position_test_1) const int width(500); const unsigned int minor_tick_count(4); - const Ruler::TickPositions ts = Ruler::calculate_tick_positions( + const TickPositions ts = Ruler::calculate_tick_positions( major_period, offset, scale, width, minor_tick_count, format); BOOST_REQUIRE_EQUAL(ts.major.size(), 5); @@ -136,7 +141,7 @@ BOOST_AUTO_TEST_CASE(tick_position_test_2) const int width(580); const unsigned int minor_tick_count(4); - const Ruler::TickPositions ts = Ruler::calculate_tick_positions( + const TickPositions ts = Ruler::calculate_tick_positions( major_period, offset, scale, width, minor_tick_count, format); const double mp = 5;