nl_convert: fix compile on MSVC (struct and string in struct had same name) (nw)

This commit is contained in:
Peter Ferrie 2015-06-03 16:46:59 -07:00
parent 4d3ae8b5ae
commit 98d72fba97
2 changed files with 3 additions and 3 deletions

View File

@ -152,7 +152,7 @@ double nl_convert_base_t::get_sp_val(const pstring &sin)
return ret;
}
nl_convert_base_t::sp_unit nl_convert_base_t::m_sp_units[] = {
nl_convert_base_t::_sp_unit nl_convert_base_t::m_sp_units[] = {
{"T", "", 1.0e12 },
{"G", "", 1.0e9 },
{"MEG", "RES_M(%g)", 1.0e6 },

View File

@ -105,7 +105,7 @@ private:
bool m_has_val;
};
struct sp_unit {
struct _sp_unit {
pstring sp_unit;
pstring nl_func;
double mult;
@ -136,7 +136,7 @@ private:
plist_t<pstring> m_ext_alias;
pnamedlist_t<sp_pin_alias_t *> m_pins;
static sp_unit m_sp_units[];
static _sp_unit m_sp_units[];
};