haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a collision name with a windows header (msys2) 

LoadLibrary is changed to LoadSymbolLibrary, due to a header included by pegtl
having a #define LoadLibrary ...
This commit is contained in:
jean-pierre charras 2022-12-09 09:36:58 +01:00
parent eaf56bc05a
commit 9a2d8e6b6b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/symbol_library.cpp
View File

@ -235,7 +235,7 @@ LIB_SYMBOL* SYMBOL_LIB::ReplaceSymbol( LIB_SYMBOL* aOldSymbol, LIB_SYMBOL* aNewS
}
SYMBOL_LIB* SYMBOL_LIB::LoadLibrary( const wxString& aFileName )
SYMBOL_LIB* SYMBOL_LIB::LoadSymbolLibrary( const wxString& aFileName )
{
std::unique_ptr<SYMBOL_LIB> lib = std::make_unique<SYMBOL_LIB>( SCH_LIB_TYPE::LT_EESCHEMA,
aFileName );
@ -272,7 +272,7 @@ SYMBOL_LIB* SYMBOL_LIBS::AddLibrary( const wxString& aFileName )
try
{
lib = SYMBOL_LIB::LoadLibrary( aFileName );
lib = SYMBOL_LIB::LoadSymbolLibrary( aFileName );
push_back( lib );
return lib;
@ -295,7 +295,7 @@ SYMBOL_LIB* SYMBOL_LIBS::AddLibrary( const wxString& aFileName, SYMBOL_LIBS::ite
try
{
lib = SYMBOL_LIB::LoadLibrary( aFileName );
lib = SYMBOL_LIB::LoadSymbolLibrary( aFileName );
if( aIterator >= begin() && aIterator < end() )
insert( aIterator, lib );

2
eeschema/symbol_library.h
View File

@ -302,7 +302,7 @@ public:
* @return SYMBOL_LIB* is the allocated and loaded SYMBOL_LIB, which is owned by the caller.
* @throw IO_ERROR if there's any problem loading the library.
*/
static SYMBOL_LIB* LoadLibrary( const wxString& aFileName );
static SYMBOL_LIB* LoadSymbolLibrary( const wxString& aFileName );
private:
SCH_LIB_TYPE type; ///< Library type indicator.