Use default member initializers for constant initial values

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index 574ecce0c11b5bac9af56d82b6a0782a5288d8b6..648c414cd2158b7d83983988f8027525b53940e6 100644 (file)
--- 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"
@@ -44,19 +45,19 @@ protected:
 
 private:
        ActionMap local_actions;
-       ActionMap *actions;
-       Parser *cur_parser;
-       unsigned cur_level;
-       const Statement *cur_st;
-       bool sub_loaded;
-       bool direct;
+       ActionMap *actions = nullptr;
+       Parser *cur_parser = nullptr;
+       unsigned cur_level = 0;
+       const Statement *cur_st = nullptr;
+       bool sub_loaded = false;
+       bool direct = false;
        std::vector<Loader *> aux_loaders;
 protected:
-       bool check_sub_loads;
+       bool check_sub_loads = false;
 
-       Loader();
+       Loader() = default;
 public:
-       virtual ~Loader() { }
+       virtual ~Loader() = default;
 
        /** Loads statements from a parser. */
        void load(Parser &p);
@@ -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. */
@@ -129,7 +130,7 @@ protected:
 
        /** Adds a keyword that is recognized but ignored. */
        void add(const std::string &k)
-       { add(k, 0); }
+       { add(k, nullptr); }
 
 private:
        void add(const std::string &, LoaderAction *);
@@ -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)