Merge pull request open-source-parsers#79 from ya1gaurav/patch-2

cdunn2001 · cdunn2001 · commit 5fda247dab4c · 2014-11-18T00:14:06.000-06:00
Remove gcc compilation warnings in json_reader.cpp
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -831,8 +831,9 @@ std::vector<Reader::StructuredError> Reader::getStructuredErrors() const {
 }
 
 bool Reader::pushError(const Value& value, const std::string& message) {
-  if(value.getOffsetStart() > end_ - begin_
-    || value.getOffsetLimit() > end_ - begin_)
+  size_t length = end_ - begin_;
+  if(value.getOffsetStart() > length
+    || value.getOffsetLimit() > length)
     return false;
   Token token;
   token.type_ = tokenError;
@@ -847,9 +848,10 @@ bool Reader::pushError(const Value& value, const std::string& message) {
 }
 
 bool Reader::pushError(const Value& value, const std::string& message, const Value& extra) {
-  if(value.getOffsetStart() > end_ - begin_
-    || value.getOffsetLimit() > end_ - begin_
-    || extra.getOffsetLimit() > end_ - begin_)
+  size_t length = end_ - begin_;
+  if(value.getOffsetStart() > length
+    || value.getOffsetLimit() > length
+    || extra.getOffsetLimit() > length)
     return false;
   Token token;
   token.type_ = tokenError;
