X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fjsonparser.cpp;h=dcb1cf6a911343d3915598856f4e77e1747738e7;hb=e14c01b5775dd2e324b16ff49498db9b9113c523;hp=4b937035b81fbcb5412efd216a8d74de779150bb;hpb=193d36c8ce13cf2c5cd055fbd008f3003dda0a3e;p=libs%2Fdatafile.git

diff --git a/source/jsonparser.cpp b/source/jsonparser.cpp
index 4b93703..dcb1cf6 100644
--- a/source/jsonparser.cpp
+++ b/source/jsonparser.cpp
@@ -9,8 +9,7 @@ namespace Msp {
 namespace DataFile {
 
 JsonParser::JsonParser(Input &i, const string &s):
-	ParserMode(i, s),
-	toplevel_state(STATE_INIT)
+	ParserMode(i, s)
 { }
 
 Statement JsonParser::parse()
@@ -82,7 +81,7 @@ Statement JsonParser::parse_statement(const Token *t, State outer_state, const s
 		if(t)
 		{
 			token = *t;
-			t = 0;
+			t = nullptr;
 		}
 		else
 			token = parse_token();
@@ -312,7 +311,7 @@ string JsonParser::unescape(const string &str)
 	StringCodec::Utf8::Encoder enc;
 	bool escape = false;
 
-	for(string::const_iterator i=str.begin(); i!=str.end(); )
+	for(auto i=str.begin(); i!=str.end(); )
 	{
 		StringCodec::unichar c = dec.decode_char(str, i);