summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-05-17 12:15:45 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-05-17 12:15:45 +0200
commitdf5c8faa8594fbbab71a2f31ce6636b996d44c41 (patch)
tree574cbc27edd1fd15c60077618d7b25ef458bf144 /src/lib/netlist
parent0c529b6c928326d6815478de5a2b230cbc886b01 (diff)
Fixed name conflict making Android build non-working (nw)
Diffstat (limited to 'src/lib/netlist')
-rw-r--r--src/lib/netlist/nl_base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 208fd966848..4db0fc8142f 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -188,12 +188,12 @@ class NETLIB_NAME(_name) : public device_t
#define NETLIB_CONSTRUCTOR_DERIVED(_name, _pclass) \
private: family_setter_t m_famsetter; \
- public: template <class _C> ATTR_COLD NETLIB_NAME(_name)(_C &owner, const pstring name) \
+ public: template <class _CLASS> ATTR_COLD NETLIB_NAME(_name)(_CLASS &owner, const pstring name) \
: NETLIB_NAME(_pclass)(owner, name)
#define NETLIB_CONSTRUCTOR(_name) \
private: family_setter_t m_famsetter; \
- public: template <class _C> ATTR_COLD NETLIB_NAME(_name)(_C &owner, const pstring name) \
+ public: template <class _CLASS> ATTR_COLD NETLIB_NAME(_name)(_CLASS &owner, const pstring name) \
: device_t(owner, name)
#define NETLIB_DYNAMIC() \