From 507229809cef9902d89ebaf19aac012c7b766497 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 6 Feb 2019 09:18:57 +0100 Subject: [PATCH] Fix a compil issue in test_lib_table.cpp, with some boost versions. --- qa/common/test_lib_table.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qa/common/test_lib_table.cpp b/qa/common/test_lib_table.cpp index 380d0d5e95..bd073cc3b8 100644 --- a/qa/common/test_lib_table.cpp +++ b/qa/common/test_lib_table.cpp @@ -295,6 +295,7 @@ BOOST_AUTO_TEST_CASE( Indexing ) // BOOST_CHECK_THROW( m_mainTableNoFb.At( 3 ), std::out_of_range ); } + /** * Test retrieval of libs by nickname */ @@ -329,10 +330,14 @@ BOOST_AUTO_TEST_CASE( URIs ) { BOOST_CHECK_EQUAL( "://lib/1", m_mainTableNoFb.GetFullURI( "Lib1" ) ); - const auto* row = m_mainTableNoFb.FindRowByURI( "://lib/1" ); + const LIB_TABLE_ROW* row = m_mainTableNoFb.FindRowByURI( "://lib/1" ); + + // A LIB_TABLE_ROW* nullptr for BOOST_CHECK_NE, because some boost version + // do not handle a nullptr with no type + const LIB_TABLE_ROW* null_row = nullptr; // should be found - BOOST_CHECK_NE( nullptr, row ); + BOOST_CHECK_NE( null_row, row ); if( row ) { @@ -341,9 +346,10 @@ BOOST_AUTO_TEST_CASE( URIs ) row = m_mainTableNoFb.FindRowByURI( "this_uri_is_not_found" ); - BOOST_CHECK_EQUAL( nullptr, row ); + BOOST_CHECK_EQUAL( null_row, row ); } + /** * Test retrieval of the logical libs function */ @@ -361,4 +367,4 @@ BOOST_AUTO_TEST_CASE( LogicalLibs ) logical_libs.begin(), logical_libs.end(), exp_libs.begin(), exp_libs.end() ); } -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END()