X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=51cdabec478d812a23a8133f3716b77c58568163;hb=e4beb0453a1cfe200fc97607afab94c3ddee1c65;hp=de9323a36269ebc51656c75e1c771a1f169bb706;hpb=e2a4cefe59dd3e6e1b2fac2fb7232326bb2b0787;p=libs%2Fdatafile.git

diff --git a/source/loader.cpp b/source/loader.cpp
index de9323a..51cdabe 100644
--- 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())
 	{