From 9534a0233c29ea34f5ea23f053298f423fb77782 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@gmx.org>
Date: Mon, 18 Mar 2019 00:01:41 +0100
Subject: [PATCH] netlist: improve readability. (nw)

---
 src/lib/netlist/analog/nld_bjt.cpp    | 4 ++--
 src/lib/netlist/analog/nld_opamps.cpp | 8 ++++----
 src/lib/netlist/nl_base.h             | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp
index c2cfbd9faca..16e9c872070 100644
--- a/src/lib/netlist/analog/nld_bjt.cpp
+++ b/src/lib/netlist/analog/nld_bjt.cpp
@@ -259,13 +259,13 @@ public:
 
 		if (m_model.m_CJE > 0.0)
 		{
-			register_sub("m_CJE", m_CJE);
+			create_and_register_subdevice("m_CJE", m_CJE);
 			connect("B", "m_CJE.1");
 			connect("E", "m_CJE.2");
 		}
 		if (m_model.m_CJC > 0.0)
 		{
-			register_sub("m_CJC", m_CJC);
+			create_and_register_subdevice("m_CJC", m_CJC);
 			connect("B", "m_CJC.1");
 			connect("C", "m_CJC.2");
 		}
diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp
index 4b5a5f8ba38..8c3c655bfa9 100644
--- a/src/lib/netlist/analog/nld_opamps.cpp
+++ b/src/lib/netlist/analog/nld_opamps.cpp
@@ -129,10 +129,10 @@ namespace netlist
 			}
 			else if (m_type == 3)
 			{
-				register_sub("CP1", m_CP);
-				register_sub("EBUF", m_EBUF);
-				register_sub("DN", m_DN, "D(IS=1e-15 N=1)");
-				register_sub("DP", m_DP, "D(IS=1e-15 N=1)");
+				create_and_register_subdevice("CP1", m_CP);
+				create_and_register_subdevice("EBUF", m_EBUF);
+				create_and_register_subdevice("DN", m_DN, "D(IS=1e-15 N=1)");
+				create_and_register_subdevice("DP", m_DP, "D(IS=1e-15 N=1)");
 
 				//m_DP->m_model.setTo("D(IS=1e-15 N=1)");
 				//m_DN->m_model.setTo("D(IS=1e-15 N=1)");
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 323f2fa7a0b..389b1178f71 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1189,10 +1189,9 @@ namespace netlist
 		const setup_t &setup() const;
 
 		template<class C, typename... Args>
-		void register_sub(const pstring &name, pool_owned_ptr<C> &dev, const Args&... args)
+		void create_and_register_subdevice(const pstring &name, pool_owned_ptr<C> &dev, Args&&... args)
 		{
-			//dev.reset(plib::palloc<C>(*this, name, args...));
-			dev = pool().make_poolptr<C>(*this, name, args...);
+			dev = pool().make_poolptr<C>(*this, name, std::forward<Args>(args)...);
 		}
 
 		void register_subalias(const pstring &name, detail::core_terminal_t &term);