X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.cpp;h=7e910b8a73c5d79adc63b161a2e01248edf50211;hb=refs%2Fheads%2Fwip;hp=5fd32c93fb59f403244deafa81904222f2f2a902;hpb=65b05e818baac970e08b3b50ef46d1c4be9b394d;p=libs%2Fdatafile.git diff --git a/source/loader.cpp b/source/loader.cpp index 5fd32c9..7e910b8 100644 --- a/source/loader.cpp +++ b/source/loader.cpp @@ -47,13 +47,6 @@ int signature_match(const string &st_sig, const string &act_sig) namespace Msp { namespace DataFile { -Loader::Loader(): - actions(0), - cur_st(0), - direct(false), - check_sub_loads(false) -{ } - void Loader::load(Parser &p) { if(!actions) @@ -212,7 +205,7 @@ bool Loader::has_action(const StatementKey &key) const LoaderAction *Loader::find_action(const StatementKey &key) const { if(!actions) - return 0; + return nullptr; auto begin = actions->lower_bound(StatementKey(key.keyword, string())); auto end = actions->upper_bound(StatementKey(key.keyword, "~")); @@ -220,7 +213,7 @@ LoaderAction *Loader::find_action(const StatementKey &key) const if(begin==end) throw unknown_keyword(key.keyword); - LoaderAction *act = 0; + LoaderAction *act = nullptr; int match = 0; for(auto i=begin; i!=end; ++i) {