Introduce the concept of future objects

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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 03a9da7bcc1aa8fc33823f404a0426f704aaeaed..afca01e9ba3b478d95bd320e550f0cf7fbf08fff 100644 (file)
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_LOADERACTION_H_
 #define MSP_DATAFILE_LOADERACTION_H_
 
-#include "except.h"
 #include "statement.h"
 
 namespace Msp {
@@ -283,9 +275,7 @@ public:
        virtual void execute(Loader &l, const Statement &st) const
        {
                typename L::Loader &ldr = dynamic_cast<typename L::Loader &>(l);
-               if(!ldr.is_pointer_reload_allowed() && ldr.get_object().*ptr0)
-                       throw InvalidState("The pointer has already been loaded");
-               ldr.get_object().*ptr0 = ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
+               ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
        }
 
        virtual std::string get_signature() const