X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=cf2b5454b907a038e66745a7ecd7fadf239dcf56;hb=14f031aead619ce8a3fff1c283c3d205d421cd1f;hp=9736d269d90ffdde9e83ea7a835032cad98ebd16;hpb=e1b8089be727f651fc2022d6e7ff775047730e85;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 9736d26..cf2b545 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -36,7 +36,11 @@ See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 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.
 */