X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinaryparser.cpp;h=e105393f3d02c16f1fbb21ff5a5922f365e8534b;hb=ffdab05698de3d2d612f04ffc146381c2362d386;hp=4ed2877a4424c2389c890473a0e71918418516ba;hpb=ed78b585cfc4ecb44972e346857e887b183fd7a7;p=libs%2Fdatafile.git

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 4ed2877..e105393 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,5 +1,4 @@
 #include <limits>
-#include <sys/param.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include "argumentstore.h"
@@ -62,7 +61,7 @@ Statement BinaryParser::parse()
 			result.args.push_back(parse_bool());
 			break;
 		case SymbolType::signature:
-			result.args.push_back(parse_symbol());
+			result.args.push_back(Value(parse_symbol()));
 			break;
 		}
 	}
@@ -91,8 +90,8 @@ void BinaryParser::process_control_statement(const Statement &st)
 
 		const string &kw = st.args[1].get<const string &>();
 		const string &args = st.args[2].get<const string &>();
-		for(string::const_iterator i=args.begin(); i!=args.end(); ++i)
-			for(unsigned j=0; valid_signatures[j]!=*i; ++j)
+		for(char c: args)
+			for(unsigned j=0; valid_signatures[j]!=c; ++j)
 				if(!valid_signatures[j])
 					throw bad_definition("__kwd");
 
@@ -201,7 +200,7 @@ IntType::Store BinaryParser::parse_int()
 
 FloatType::Store BinaryParser::parse_float()
 {
-	UInt64 encoded = 0;
+	uint64_t encoded = 0;
 	for(unsigned i=0; i<float_precision; i+=8)
 	{
 		int c = in.get();