Remove pointer reload prevention feature; the purpose it was added for is now gone

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

diff --git a/source/loader.h b/source/loader.h
index 3c4785c493017eadeef3f2c20bb70e05b4bb9cf8..4ea7994e757f76476dda000f20c67fa44e21fee9 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -31,7 +31,7 @@ When loading has finished successfully, the virtual function finish() is
 called.  Any post-processing of the data should be placed here and not in the
 destructor.
 
-See also classes BasicLoader and BasicLoader2.
+See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
 class Loader
 {
@@ -52,15 +52,12 @@ private:
        const Statement *cur_st;
        bool sub_loaded;
 protected:
-       bool allow_pointer_reload;
        bool check_sub_loads;
 
        Loader();
 public:
        virtual ~Loader();
 
-       bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
-
        /** Loads statements from a parser. */
        void load(Parser &p);
 
@@ -152,42 +149,6 @@ protected:
 };
 
 
-/**
-Deprecated.  See ObjectLoader in objectloader.h.
-*/
-template<typename O>
-class BasicLoader: public Loader
-{
-public:
-       typedef O Object;
-
-protected:
-       O &obj;
-
-public:
-       BasicLoader(O &o): obj(o) { }
-       O &get_object() const { return obj; }
-};
-
-
-/**
-Deprecated.  See CollectionObjectLoader in objectloader.h.
-*/
-template<typename O, typename C>
-class BasicLoader2: public BasicLoader<O>
-{
-public:
-       typedef C Collection;
-
-protected:
-       C &coll;
-
-public:
-       BasicLoader2(O &o, C &c): BasicLoader<O>(o), coll(c) { }
-       C &get_collection() const { return coll; }
-};
-
-
 /**
 Loads an object from a file.  The object must have a public Loader class.
 */