From e8627c89dff0b9a5db470a08e8cc8dc5324995c3 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Sun, 31 Jul 2022 16:43:52 -0700 Subject: [PATCH] Fix initial compile error on Linux. Still getting link error with DIALOG_SIM_MODEL --- eeschema/sim/sim_model.cpp | 118 ++++++++++++++++++------------------- eeschema/sim/sim_value.cpp | 1 - 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/eeschema/sim/sim_model.cpp b/eeschema/sim/sim_model.cpp index 91da0221de..7f1eb5c46e 100644 --- a/eeschema/sim/sim_model.cpp +++ b/eeschema/sim/sim_model.cpp @@ -631,6 +631,65 @@ TYPE SIM_MODEL::InferTypeFromLegacyFields( const std::vector& aFields ) } +template +void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) +{ + doReadDataFields( aSymbolPinCount, aFields ); +} + + +template <> +void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) +{ + ReadDataSchFields( aSymbolPinCount, aFields ); +} + + +template <> +void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) +{ + ReadDataLibFields( aSymbolPinCount, aFields ); +} + + +void SIM_MODEL::ReadDataSchFields( unsigned aSymbolPinCount, const std::vector* aFields ) +{ + doReadDataFields( aSymbolPinCount, aFields ); +} + + +void SIM_MODEL::ReadDataLibFields( unsigned aSymbolPinCount, const std::vector* aFields ) +{ + doReadDataFields( aSymbolPinCount, aFields ); +} + + +template <> +void SIM_MODEL::WriteFields( std::vector& aFields ) const +{ + WriteDataSchFields( aFields ); +} + + +template <> +void SIM_MODEL::WriteFields( std::vector& aFields ) const +{ + WriteDataLibFields( aFields ); +} + + +void SIM_MODEL::WriteDataSchFields( std::vector& aFields ) const +{ + doWriteFields( aFields ); +} + + +void SIM_MODEL::WriteDataLibFields( std::vector& aFields ) const +{ + doWriteFields( aFields ); +} + + std::unique_ptr SIM_MODEL::Create( TYPE aType, unsigned aSymbolPinCount ) { std::unique_ptr model = create( aType ); @@ -845,65 +904,6 @@ void SIM_MODEL::ReadSpiceCode( const std::string& aSpiceCode ) } -template -void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) -{ - doReadDataFields( aSymbolPinCount, aFields ); -} - - -template <> -void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) -{ - ReadDataSchFields( aSymbolPinCount, aFields ); -} - - -template <> -void SIM_MODEL::ReadDataFields( unsigned aSymbolPinCount, const std::vector* aFields ) -{ - ReadDataLibFields( aSymbolPinCount, aFields ); -} - - -void SIM_MODEL::ReadDataSchFields( unsigned aSymbolPinCount, const std::vector* aFields ) -{ - doReadDataFields( aSymbolPinCount, aFields ); -} - - -void SIM_MODEL::ReadDataLibFields( unsigned aSymbolPinCount, const std::vector* aFields ) -{ - doReadDataFields( aSymbolPinCount, aFields ); -} - - -template <> -void SIM_MODEL::WriteFields( std::vector& aFields ) const -{ - WriteDataSchFields( aFields ); -} - - -template <> -void SIM_MODEL::WriteFields( std::vector& aFields ) const -{ - WriteDataLibFields( aFields ); -} - - -void SIM_MODEL::WriteDataSchFields( std::vector& aFields ) const -{ - doWriteFields( aFields ); -} - - -void SIM_MODEL::WriteDataLibFields( std::vector& aFields ) const -{ - doWriteFields( aFields ); -} - - wxString SIM_MODEL::GenerateSpiceModelLine( const wxString& aModelName ) const { LOCALE_IO toggle; diff --git a/eeschema/sim/sim_value.cpp b/eeschema/sim/sim_value.cpp index 283a19f7c8..72c3298bc3 100644 --- a/eeschema/sim/sim_value.cpp +++ b/eeschema/sim/sim_value.cpp @@ -664,7 +664,6 @@ bool SIM_VALUE_INST::operator==( const bool& aOther ) const } -template bool SIM_VALUE_INST::operator==( const bool& aOther ) const; template bool SIM_VALUE_INST::operator==( const long& aOther ) const; template bool SIM_VALUE_INST::operator==( const double& aOther ) const; template bool SIM_VALUE_INST>::operator==( const std::complex& aOther ) const;