diff options
Diffstat (limited to 'src/lib/netlist/core/param.h')
-rw-r--r-- | src/lib/netlist/core/param.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/lib/netlist/core/param.h b/src/lib/netlist/core/param.h index adb13f465da..2007d1f844d 100644 --- a/src/lib/netlist/core/param.h +++ b/src/lib/netlist/core/param.h @@ -8,19 +8,6 @@ #ifndef NL_CORE_PARAM_H_ #define NL_CORE_PARAM_H_ -#if 0 -#include "../nl_config.h" -#include "../nl_factory.h" -#include "../nl_setup.h" - -#include "../plib/ppreprocessor.h" - -#include <initializer_list> -#include <stack> -#include <unordered_map> -#include <vector> -#endif - #include "../nltypes.h" #include "base_objects.h" @@ -244,7 +231,7 @@ namespace netlist { } - plib::psource_t::stream_ptr stream(); + plib::istream_uptr stream(); protected: void changed() noexcept override { } }; @@ -264,7 +251,7 @@ namespace netlist protected: void changed() noexcept override { - plib::istream_read(stream().stream(), m_data.data(), 1<<AW); + plib::istream_read(*stream(), m_data.data(), 1<<AW); } private: @@ -321,7 +308,7 @@ namespace netlist auto f = this->stream(); if (!f.empty()) { - plib::istream_read(f.stream(), m_data.data(), 1<<AW); + plib::istream_read(*f, m_data.data(), 1<<AW); // FIXME: check for failbit if not in validation. } else |