disable deprecation warnings in Debug build, change message in fp_lib_table.cpp
This commit is contained in:
parent
bcf79484f0
commit
a3211b2b9e
|
@ -109,7 +109,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set( CMAKE_C_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" )
|
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_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG" )
|
||||||
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
|
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
|
||||||
|
|
|
@ -626,11 +626,15 @@ const FP_LIB_TABLE::ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname )
|
||||||
|
|
||||||
if( !row )
|
if( !row )
|
||||||
{
|
{
|
||||||
wxString msg = wxString::Format( _( "lib table contains no logical lib '%s'" ),
|
wxString msg = wxString::Format(
|
||||||
|
_( "fp-lib-table files contain no lib with nickname '%s'" ),
|
||||||
GetChars( aNickname ) );
|
GetChars( aNickname ) );
|
||||||
|
|
||||||
THROW_IO_ERROR( msg );
|
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 )
|
if( !row->plugin )
|
||||||
row->setPlugin( IO_MGR::PluginFind( row->type ) );
|
row->setPlugin( IO_MGR::PluginFind( row->type ) );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue