summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/putil.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/plib/putil.h')
-rw-r--r--src/lib/netlist/plib/putil.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 793b8e8eaf4..8fd74ac8b8c 100644
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -199,11 +199,11 @@ namespace plib
//&& (ret == T(0) || std::abs(ret) >= std::numeric_limits<T>::min() ))
{
if (cstr[idx] != 0)
- throw pexception(pstring("Continuation after numeric value ends: ") + cstr);
+ throw pexception(pstring("Continuation after numeric value ends: ") + pstring(cstr));
}
else
{
- throw pexception(pstring("Out of range: ") + cstr);
+ throw pexception(pstring("Out of range: ") + pstring(cstr));
}
return static_cast<T>(ret);
}
@@ -230,8 +230,8 @@ namespace plib
struct penum_base
{
protected:
- static int from_string_int(const char *str, const char *x);
- static std::string nthstr(int n, const char *str);
+ static int from_string_int(const pstring &str, const pstring &x);
+ static std::string nthstr(int n, const pstring &str);
};
} // namespace plib
@@ -241,16 +241,16 @@ namespace plib
enum E { __VA_ARGS__ }; \
ename (E v) : m_v(v) { } \
template <typename T> explicit ename(T val) { m_v = static_cast<E>(val); } \
- bool set_from_string (const std::string &s) { \
- static char const *const strings = # __VA_ARGS__; \
- int f = from_string_int(strings, s.c_str()); \
+ bool set_from_string (const pstring &s) { \
+ static const pstring strings = # __VA_ARGS__; \
+ int f = from_string_int(strings, s); \
if (f>=0) { m_v = static_cast<E>(f); return true; } else { return false; } \
} \
operator E() const {return m_v;} \
bool operator==(const ename &rhs) const {return m_v == rhs.m_v;} \
bool operator==(const E &rhs) const {return m_v == rhs;} \
std::string name() const { \
- static char const *const strings = # __VA_ARGS__; \
+ static const pstring strings = # __VA_ARGS__; \
return nthstr(static_cast<int>(m_v), strings); \
} \
private: E m_v; };