X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floaderaction.h;h=afca01e9ba3b478d95bd320e550f0cf7fbf08fff;hb=01de40aa67599511f7843ab5b5aa24ec59a2768f;hp=03a9da7bcc1aa8fc33823f404a0426f704aaeaed;hpb=e2a4cefe59dd3e6e1b2fac2fb7232326bb2b0787;p=libs%2Fdatafile.git

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 03a9da7..afca01e 100644
--- 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