From df5c8faa8594fbbab71a2f31ce6636b996d44c41 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 17 May 2016 12:15:45 +0200 Subject: [PATCH] Fixed name conflict making Android build non-working (nw) --- src/lib/netlist/nl_base.h | 4 ++-- 1 file 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 ATTR_COLD NETLIB_NAME(_name)(_C &owner, const pstring name) \ + public: template 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 ATTR_COLD NETLIB_NAME(_name)(_C &owner, const pstring name) \ + public: template ATTR_COLD NETLIB_NAME(_name)(_CLASS &owner, const pstring name) \ : device_t(owner, name) #define NETLIB_DYNAMIC() \