diff --git a/modules/geom/src/vec_mat_predicates.hh b/modules/geom/src/vec_mat_predicates.hh index e294efdbfc23a0938d72c35e98653231e9f0a3b7..7f897a5099941015200444cc5148a19098fa39ca 100644 --- a/modules/geom/src/vec_mat_predicates.hh +++ b/modules/geom/src/vec_mat_predicates.hh @@ -39,10 +39,10 @@ boost::test_tools::predicate_result vec_is_close(const V& v1, const V& v2, std::string labels[]={"x","y","z","w"}; bool flag=true; boost::test_tools::predicate_result res( false ); -#if BOOST_VERSION<103400 - boost::test_tools::close_at_tolerance<Real> close_test(tolerance); -#else +#if BOOST_VERSION<105900 boost::test_tools::close_at_tolerance<Real> close_test(boost::test_tools::percent_tolerance(tolerance)); +#else + boost::math::fpc::close_at_tolerance<Real> close_test(boost::math::fpc::percent_tolerance(tolerance)); #endif for(unsigned int i=0;i<dim;++i){ if(v1[i]==0.0){ @@ -97,10 +97,10 @@ boost::test_tools::predicate_result mat_is_close(const M& m1, const M& m2, { bool flag=true; boost::test_tools::predicate_result res( false ); -#if BOOST_VERSION<103400 - boost::test_tools::close_at_tolerance<Real> close_test(tolerance); -#else +#if BOOST_VERSION<105900 boost::test_tools::close_at_tolerance<Real> close_test(boost::test_tools::percent_tolerance(tolerance)); +#else + boost::math::fpc::close_at_tolerance<Real> close_test(boost::math::fpc::percent_tolerance(tolerance)); #endif for(unsigned int i=0;i<dim;++i){ for(unsigned int j=0;j<dim;++j){ diff --git a/modules/img/alg/tests/test_normalizer.cc b/modules/img/alg/tests/test_normalizer.cc index e072626dbc562e70703ae226606c4c9e0d1f6c9d..205a5a5b31125332ea527bd4e0e666f75f0b5354 100644 --- a/modules/img/alg/tests/test_normalizer.cc +++ b/modules/img/alg/tests/test_normalizer.cc @@ -39,7 +39,11 @@ using namespace ost::img::alg; void test() { - boost::test_tools::close_at_tolerance<Real> close_test(::boost::test_tools::percent_tolerance(0.001)); +#if BOOST_VERSION<105900 + boost::test_tools::close_at_tolerance<Real> close_test(boost::test_tools::percent_tolerance(0.001)); +#else + boost::math::fpc::close_at_tolerance<Real> close_test(boost::math::fpc::percent_tolerance(0.001)); +#endif ost::img::ImageHandle testimage=ost::img::CreateImage(ost::img::Extent(ost::img::Point(0,0),ost::img::Point(3,3))); int counter=0; for (ost::img::ExtentIterator i(testimage.GetExtent()); !i.AtEnd(); ++i, ++counter) { diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc index 411201a97e167be7235c1aa9ab041c43e98c95c9..9ac75d094c16fb64cddbc5ec231d41a4a5804832 100644 --- a/modules/io/tests/test_io_img.cc +++ b/modules/io/tests/test_io_img.cc @@ -48,7 +48,11 @@ BOOST_AUTO_TEST_SUITE( io ) BOOST_AUTO_TEST_CASE(test_io_img) { //float tests - boost::test_tools::close_at_tolerance<Real> close_test(::boost::test_tools::percent_tolerance(0.001)); +#if BOOST_VERSION<105900 + boost::test_tools::close_at_tolerance<Real> close_test(boost::test_tools::percent_tolerance(0.001)); +#else + boost::math::fpc::close_at_tolerance<Real> close_test(boost::math::fpc::percent_tolerance(0.001)); +#endif ost::img::ImageHandle testimage=ost::img::CreateImage(ost::img::Extent(ost::img::Point(0,0),ost::img::Point(4,3))); int counter=0; for (img::ExtentIterator i(testimage.GetExtent()); !i.AtEnd(); ++i, ++counter) { @@ -164,7 +168,11 @@ BOOST_AUTO_TEST_CASE(test_io_img_dat) { // test for the dat file format using a square image (non square images not supported by dat) //float test - boost::test_tools::close_at_tolerance<Real> close_test(::boost::test_tools::percent_tolerance(0.001)); +#if BOOST_VERSION<105900 + boost::test_tools::close_at_tolerance<Real> close_test(boost::test_tools::percent_tolerance(0.001)); +#else + boost::math::fpc::close_at_tolerance<Real> close_test(boost::math::fpc::percent_tolerance(0.001)); +#endif ost::img::ImageHandle testimage=ost::img::CreateImage(ost::img::Extent(ost::img::Point(0,0),ost::img::Point(3,3))); int counter=0; for (img::ExtentIterator i(testimage.GetExtent()); !i.AtEnd(); ++i, ++counter) { diff --git a/modules/seq/base/tests/test_alignment.cc b/modules/seq/base/tests/test_alignment.cc index a70c19b226cb46140aa1fb70b5a8518b581156bd..52da21684c6dfc2f68e6788b36fce28bad85e65e 100644 --- a/modules/seq/base/tests/test_alignment.cc +++ b/modules/seq/base/tests/test_alignment.cc @@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE(alignment_attach_view) BOOST_CHECK_NO_THROW(a.AttachView(0,EntityView())); BOOST_CHECK_EQUAL(a.GetResidue(0,1), EntityView()); BOOST_CHECK_EQUAL(a.GetResidue(0,3), EntityView()); - BOOST_CHECK_THROW(a.GetResidue(-1,0),std::out_of_range) + BOOST_CHECK_THROW(a.GetResidue(-1,0),std::out_of_range); } BOOST_AUTO_TEST_CASE(alignment_cut)