Move the definition of Input's operator bool to the header

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

diff --git a/source/loader.h b/source/loader.h
index b9eee50d8cde99b49fc897952580fa1d1695893e..5b96cb0954812f2f17ec1d01e4b1260f8c0cf2a4 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -6,6 +6,7 @@
 #include <msp/io/file.h>
 #include "loaderaction.h"
 #include "meta.h"
+#include "mspdatafile_api.h"
 #include "parser.h"
 #include "statement.h"
 
@@ -34,10 +35,10 @@ destructor.
 
 See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
-class Loader: private NonCopyable
+class MSPDATAFILE_API Loader: private NonCopyable
 {
 protected:
-       class ActionMap: public std::map<StatementKey, LoaderAction *>, private NonCopyable
+       class MSPDATAFILE_API ActionMap: public std::map<StatementKey, LoaderAction *>, private NonCopyable
        {
        public:
                ~ActionMap();
@@ -83,7 +84,7 @@ protected:
        }
 
        /** Loads a sub-object from the statement being processed with an extra
-       parameter for the Loader.  The Loader class of the sub-object is
+       arguments for the Loader.  The Loader class of the sub-object is
        automatically used. */
        template<typename S, typename... Args>
        void load_sub(S &s, Args &&... args)
@@ -192,7 +193,7 @@ void load(T &obj, typename T::Loader::Collection &coll, const std::string &fn, A
 }
 
 /**
-Loads an object from a file stored in a collection.  The object must havea
+Loads an object from a file stored in a collection.  The object must have a
 public Loader class.  Any extra arguments are passed to the Loader constructor.
 */
 template<typename T, typename C, typename... Args>