From a3211b2b9e57a36c79f4ba2b00d0ac1aa30dceb3 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sat, 18 Jan 2014 03:04:12 -0600 Subject: [PATCH] disable deprecation warnings in Debug build, change message in fp_lib_table.cpp --- CMakeLists.txt | 2 +- common/fp_lib_table.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 908a60c39c..3a38d84220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) endif() set( CMAKE_C_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" ) - set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" ) + set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG -Wno-deprecated-declarations" ) set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" ) diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index fe8aeb92cc..3df80ec6d1 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -626,11 +626,15 @@ const FP_LIB_TABLE::ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname ) if( !row ) { - wxString msg = wxString::Format( _( "lib table contains no logical lib '%s'" ), - GetChars( aNickname ) ); + wxString msg = wxString::Format( + _( "fp-lib-table files contain no lib with nickname '%s'" ), + GetChars( aNickname ) ); + THROW_IO_ERROR( msg ); } + // We've been 'lazy' up until now, but it cannot be deferred any longer, + // instantiate a PLUGIN of the proper kind if it is not already in this ROW. if( !row->plugin ) row->setPlugin( IO_MGR::PluginFind( row->type ) );