From 7e81da8d9a6e689e271f4f0450a69d8a14f515bb Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 29 Aug 2021 17:17:23 +0300
Subject: [PATCH] Use metaprogramming constructs from std

---
 source/collection.h   | 27 ++++++++++++++-------------
 source/loader.h       |  5 +++--
 source/loaderaction.h |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/collection.h b/source/collection.h
index aa3c18a..473b58e 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_COLLECTION_H_
 #define MSP_DATAFILE_COLLECTION_H_
 
+#include <type_traits>
 #include <msp/core/attributes.h>
 #include <msp/core/maputils.h>
 #include <msp/core/noncopyable.h>
@@ -104,7 +105,7 @@ public:
 		if(!item)
 			throw std::invalid_argument("Collection::add(item)");
 
-		typedef typename RemoveConst<T>::Type NCT;
+		typedef typename std::remove_cv<T>::type NCT;
 		RefPtr<NCT> ptr(item);
 		try
 		{
@@ -122,7 +123,7 @@ public:
 	template<typename T>
 	T &get(const std::string &name) const
 	{
-		return extract<typename RemoveConst<T>::Type>(get_item(items, name));
+		return extract<typename std::remove_cv<T>::type>(get_item(items, name));
 	}
 
 	/** Gets a typed object from the collection.  If the name is not found,
@@ -131,7 +132,7 @@ public:
 	template<typename T>
 	T &get(const std::string &name)
 	{
-		typedef typename RemoveConst<T>::Type NCT;
+		typedef typename std::remove_cv<T>::type NCT;
 		return extract<NCT>(get_var(name, get_type<NCT>(name)));
 	}
 
@@ -142,13 +143,13 @@ public:
 	T *find(const std::string &name) const
 	{
 		ItemMap::const_iterator i = items.find(name);
-		return (i!=items.end() ? extract<typename RemoveConst<T>::Type>(i->second) : 0);
+		return (i!=items.end() ? extract<typename std::remove_cv<T>::type>(i->second) : 0);
 	}
 
 	template<typename T>
 	T *find(const std::string &name)
 	{
-		typedef typename RemoveConst<T>::Type NCT;
+		typedef typename std::remove_cv<T>::type NCT;
 		const Variant *var = find_var(name, get_type<NCT>(name));
 		return (var ? &extract<NCT>(*var) : 0);
 	}
@@ -187,7 +188,7 @@ public:
 	std::list<std::string> get_names() const
 	{
 		std::list<std::string> names;
-		gather_items<typename RemoveConst<T>::Type>(0, &names, 0, false);
+		gather_items<typename std::remove_cv<T>::type>(0, &names, 0, false);
 		return names;
 	}
 
@@ -197,7 +198,7 @@ public:
 	std::list<std::string> get_names()
 	{
 		std::list<std::string> names;
-		gather_items<typename RemoveConst<T>::Type>(0, &names, 0, true);
+		gather_items<typename std::remove_cv<T>::type>(0, &names, 0, true);
 		return names;
 	}
 
@@ -206,7 +207,7 @@ public:
 	std::list<T *> get_list() const
 	{
 		std::vector<const Variant *> vars;
-		gather_items<typename RemoveConst<T>::Type>(&vars, 0, 0, false);
+		gather_items<typename std::remove_cv<T>::type>(&vars, 0, 0, false);
 		return extract_list<T>(vars);
 	}
 
@@ -215,12 +216,12 @@ public:
 	template<typename T>
 	std::list<T *> get_list()
 	{
-		CollectionItemTypeBase *type = get_type<typename RemoveConst<T>::Type>();
+		CollectionItemTypeBase *type = get_type<typename std::remove_cv<T>::type>();
 		if(type)
 			load_items_from_sources(*type);
 
 		std::vector<const Variant *> vars;
-		gather_items<typename RemoveConst<T>::Type>(&vars, 0, type, true);
+		gather_items<typename std::remove_cv<T>::type>(&vars, 0, type, true);
 		return extract_list<T>(vars);
 	}
 
@@ -242,19 +243,19 @@ public:
 	/// Checks whether a typed object exists in the collection.
 	template<typename T>
 	bool contains(const std::string &name) const
-	{ return get_status<typename RemoveConst<T>::Type>(name)==1; }
+	{ return get_status<typename std::remove_cv<T>::type>(name)==1; }
 
 	/** Checks whether a typed object exists in the collection or is loadable
 	from a source. */
 	template<typename T>
 	bool contains(const std::string &name)
-	{ return get_status<typename RemoveConst<T>::Type>(name)>0; }
+	{ return get_status<typename std::remove_cv<T>::type>(name)>0; }
 
 	/// Returns the name of an item in the collection.
 	template<typename T>
 	const std::string &get_name(T *d) const
 	{
-		typedef RefPtr<typename RemoveConst<T>::Type> RPNCT;
+		typedef RefPtr<typename std::remove_cv<T>::type> RPNCT;
 
 		for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
 			if(i->second.check_type<RPNCT>())
diff --git a/source/loader.h b/source/loader.h
index 574ecce..926a2a1 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
+#include <type_traits>
 #include <map>
 #include <msp/io/file.h>
 #include "loaderaction.h"
@@ -115,7 +116,7 @@ protected:
 	/** Adds a keyword that is loaded by calling a function with a bound
 	first argument. */
 	template<typename L, typename B0, typename... Args>
-	void add(const std::string &k, void (L::*func)(B0, Args...), const typename RemoveReference<B0>::Type &b0)
+	void add(const std::string &k, void (L::*func)(B0, Args...), const typename std::remove_reference<B0>::type &b0)
 	{ add(k, new LoaderFuncNBound1<L, B0, Args...>(func, b0)); }
 
 	/** Adds a keyword that is loaded into a member of the loaded object. */
@@ -191,7 +192,7 @@ Loads an object from a file stored in a collection.  The object must havea
 public Loader class.  Any extra arguments are passed to the Loader constructor.
 */
 template<typename T, typename C, typename... Args>
-typename EnableIf<NeedsCollection<typename T::Loader>::value, void>::No load(T &obj, C &coll, const std::string &fn, Args &... args)
+typename std::enable_if<!NeedsCollection<typename T::Loader>::value>::type load(T &obj, C &coll, const std::string &fn, Args &... args)
 {
 	RefPtr<IO::Seekable> in = coll.open_raw(fn);
 	if(!in)
diff --git a/source/loaderaction.h b/source/loaderaction.h
index c7c5938..6931f48 100644
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -234,7 +234,7 @@ class LoaderFuncNBound1: public LoaderAction
 {
 protected:
 	typedef void (L::*FuncType)(B0, Args...);
-	typedef typename RemoveReference<B0>::Type Bound0Type;
+	typedef typename std::remove_reference<B0>::type Bound0Type;
 
 	FuncType func;
 	Bound0Type bound0;
-- 
2.45.2