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

Fix the order of some includes to avoid a conflict with a Windows header

This commit is contained in:
jean-pierre charras 2022-11-19 11:25:58 +01:00
parent 23480cdee3
commit b0b8a8dd67
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sim/sim_lib_mgr.cpp
View File

@ -22,13 +22,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <sim/sim_lib_mgr.h>
#include <sch_symbol.h>
#include <sim/sim_library.h>
#include <sim/sim_model.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <string> #include <string>
#include <sch_symbol.h>
// Include simulator headers after wxWidgets headers to avoid conflicts with Windows headers
// (especially on msys2 + wxWidgets 3.0.x)
#include <sim/sim_lib_mgr.h>
#include <sim/sim_library.h>
#include <sim/sim_model.h>
SIM_LIB_MGR::SIM_LIB_MGR( const PROJECT& aPrj ) : m_project( aPrj ) SIM_LIB_MGR::SIM_LIB_MGR( const PROJECT& aPrj ) : m_project( aPrj )
{ {

10
eeschema/sim/sim_model.cpp
View File

@ -21,6 +21,8 @@
* or you may write to the Free Software Foundation, Inc., * or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <lib_symbol.h>
#include <confirm.h>
#include <sim/sim_model.h> #include <sim/sim_model.h>
#include <sim/sim_model_behavioral.h> #include <sim/sim_model_behavioral.h>
@ -38,9 +40,6 @@
#include <sim/sim_library_kibis.h> #include <sim/sim_library_kibis.h>
#include <lib_symbol.h>
#include <confirm.h>
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@ -50,7 +49,6 @@
#include <iterator> #include <iterator>
using DEVICE_TYPE = SIM_MODEL::DEVICE_TYPE_;
using TYPE = SIM_MODEL::TYPE; using TYPE = SIM_MODEL::TYPE;
@ -812,7 +810,7 @@ std::unique_ptr<SIM_MODEL> SIM_MODEL::Create( TYPE aType )
case TYPE::C: case TYPE::C:
case TYPE::L: case TYPE::L:
return std::make_unique<SIM_MODEL_IDEAL>( aType ); return std::make_unique<SIM_MODEL_IDEAL>( aType );
case TYPE::R_POT: case TYPE::R_POT:
return std::make_unique<SIM_MODEL_R_POT>(); return std::make_unique<SIM_MODEL_R_POT>();
@ -903,7 +901,7 @@ SIM_MODEL::SIM_MODEL( TYPE aType,
SIM_MODEL::SIM_MODEL( TYPE aType, SIM_MODEL::SIM_MODEL( TYPE aType,
std::unique_ptr<SPICE_GENERATOR> aSpiceGenerator, std::unique_ptr<SPICE_GENERATOR> aSpiceGenerator,
std::unique_ptr<SIM_SERDE> aSerde ) : std::unique_ptr<SIM_SERDE> aSerde ) :
m_baseModel( nullptr ), m_baseModel( nullptr ),
m_serde( std::move( aSerde ) ), m_serde( std::move( aSerde ) ),
m_spiceGenerator( std::move( aSpiceGenerator ) ), m_spiceGenerator( std::move( aSpiceGenerator ) ),