Fix a compil issue in test_lib_table.cpp, with some boost versions.

This commit is contained in:
jean-pierre charras 2019-02-06 09:18:57 +01:00
parent 8bc870c753
commit 507229809c
1 changed files with 10 additions and 4 deletions

View File

@ -295,6 +295,7 @@ BOOST_AUTO_TEST_CASE( Indexing )
// BOOST_CHECK_THROW( m_mainTableNoFb.At( 3 ), std::out_of_range ); // BOOST_CHECK_THROW( m_mainTableNoFb.At( 3 ), std::out_of_range );
} }
/** /**
* Test retrieval of libs by nickname * Test retrieval of libs by nickname
*/ */
@ -329,10 +330,14 @@ BOOST_AUTO_TEST_CASE( URIs )
{ {
BOOST_CHECK_EQUAL( "://lib/1", m_mainTableNoFb.GetFullURI( "Lib1" ) ); 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 // should be found
BOOST_CHECK_NE( nullptr, row ); BOOST_CHECK_NE( null_row, row );
if( row ) if( row )
{ {
@ -341,9 +346,10 @@ BOOST_AUTO_TEST_CASE( URIs )
row = m_mainTableNoFb.FindRowByURI( "this_uri_is_not_found" ); 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 * 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() ); logical_libs.begin(), logical_libs.end(), exp_libs.begin(), exp_libs.end() );
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()