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

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

diff --git a/source/loader.cpp b/source/loader.cpp
index de9323a36269ebc51656c75e1c771a1f169bb706..51cdabec478d812a23a8133f3716b77c58568163 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,11 +1,4 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "loader.h"
 #include "type.h"
 
@@ -53,7 +46,6 @@ namespace DataFile {
 
 Loader::Loader():
        cur_st(0),
-       allow_pointer_reload(true),
        check_sub_loads(false)
 { }
 
@@ -119,7 +111,7 @@ void Loader::load_sub_with(Loader &ldr)
 
 void Loader::add(const string &kwd, LoaderAction *act)
 {
-       ActionKey key(kwd, act->get_signature());
+       ActionKey key(kwd, (act ? act->get_signature() : "*"));
        ActionMap::iterator i = actions.find(key);
        if(i!=actions.end())
        {