Minor style/typo fixes

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

diff --git a/source/loader.h b/source/loader.h
index 5dac2e6b46fd8d35b38f35fafcc3f8cdb3549387..cf2b5454b907a038e66745a7ecd7fadf239dcf56 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -33,10 +33,14 @@ destructor.
 
 See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
-class Loader
+class Loader: private NonCopyable
 {
 protected:
-       typedef std::map<StatementKey, LoaderAction *> ActionMap;
+       class ActionMap: public std::map<StatementKey, LoaderAction *>, private NonCopyable
+       {
+       public:
+               ~ActionMap();
+       };
 
 private:
        ActionMap local_actions;
@@ -52,7 +56,7 @@ protected:
 
        Loader();
 public:
-       virtual ~Loader();
+       virtual ~Loader() { }
 
        /** Loads statements from a parser. */
        void load(Parser &p);
@@ -188,7 +192,7 @@ void load(T &obj, const std::string &fn, Args &... args)
 }
 
 /**
-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.  The collection is passed to the Loader constructor,
 followed by any extra arguments.
 */