From a3ce88d45e535d1275d29d5033b0a423ab4fe326 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 11 Dec 2023 10:28:45 +0200
Subject: [PATCH] Simplify DynamicObjectLoader with an if constexpr

---
 Build                        |  2 +-
 source/dynamicobjectloader.h | 33 ++++++++-------------------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/Build b/Build
index 5e962e6..0339dd2 100644
--- a/Build
+++ b/Build
@@ -8,7 +8,7 @@ package "mspdatafile"
 
 	build_info
 	{
-		standard CXX "c++14";
+		standard CXX "c++17";
 	};
 
 	library "mspdatafile"
diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index 43c4b1f..2cf1b36 100644
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -52,14 +52,6 @@ public:
 protected:
 	virtual void type(const Symbol &);
 
-private:
-	template<typename U>
-	typename std::enable_if<NeedsCollection<typename U::Loader>::value, std::unique_ptr<typename U::Loader>>::type create_object_loader(U &obj) const;
-
-	template<typename U>
-	typename std::enable_if<!NeedsCollection<typename U::Loader>::value, std::unique_ptr<typename U::Loader>>::type create_object_loader(U &obj) const;
-
-protected:
 	virtual const TypeRegistry &get_type_registry() const = 0;
 };
 
@@ -100,29 +92,20 @@ void DynamicObjectLoader<T, C>::type(const Symbol &t)
 	get_type_registry().invoke(t.name, *this);
 }
 
-template<typename T, typename C>
-template<typename U>
-typename std::enable_if<NeedsCollection<typename U::Loader>::value, std::unique_ptr<typename U::Loader>>::type DynamicObjectLoader<T, C>::create_object_loader(U &obj) const
-{
-	if(!coll)
-		throw no_collection(typeid(U));
-	return std::make_unique<typename U::Loader>(obj, *coll);
-}
-
-template<typename T, typename C>
-template<typename U>
-typename std::enable_if<!NeedsCollection<typename U::Loader>::value, std::unique_ptr<typename U::Loader>>::type DynamicObjectLoader<T, C>::create_object_loader(U &obj) const
-{
-	return std::make_unique<typename U::Loader>(obj);
-}
-
 
 template<typename T, typename C>
 template<typename U>
 void DynamicObjectLoader<T, C>::CreateObject<U>::operator()(const std::string &, DynamicObjectLoader &ldr) const
 {
 	ldr.object = std::make_unique<U>();
-	ldr.obj_loader = ldr.create_object_loader<U>(static_cast<U &>(*ldr.object));
+	if constexpr(NeedsCollection<typename U::Loader>::value)
+	{
+		if(!ldr.coll)
+			throw no_collection(typeid(U));
+		ldr.obj_loader = std::make_unique<typename U::Loader>(static_cast<U &>(*ldr.object), *ldr.coll);
+	}
+	else
+		ldr.obj_loader = std::make_unique<typename U::Loader>(static_cast<U &>(*ldr.object));
 	ldr.add_auxiliary_loader(*ldr.obj_loader);
 	ldr.store_func = [](Collection &c, const std::string &n, std::unique_ptr<T> o){ c.add(n, std::unique_ptr<U>(static_cast<U *>(o.release()))); };
 }
-- 
2.45.2