generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-29 22:32:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #474 from cdunn2001/fix-warning

Browse Source 
Fix some warnings
This commit is contained in:
Christopher Dunn 2016-05-15 23:35:02 -05:00
commit 4356d9bba1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jsontestrunner/main.cpp
View File

@ -58,7 +58,7 @@ static JSONCPP_STRING readInputTestFile(const char* path) {
return JSONCPP_STRING(""); return JSONCPP_STRING("");
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
long const size = ftell(file); long const size = ftell(file);
unsigned long const usize = static_cast<unsigned long const>(size); unsigned long const usize = static_cast<unsigned long>(size);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
JSONCPP_STRING text; JSONCPP_STRING text;
char* buffer = new char[size + 1]; char* buffer = new char[size + 1];

26
src/lib_json/json_reader.cpp
View File

@ -430,25 +430,25 @@ void Reader::readNumber() {
char c = '0'; // stopgap for already consumed character char c = '0'; // stopgap for already consumed character
// integral part // integral part
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
// fractional part // fractional part
if (c == '.') { if (c == '.') {
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
} }
// exponential part // exponential part
if (c == 'e' || c == 'E') { if (c == 'e' || c == 'E') {
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
if (c == '+' || c == '-') if (c == '+' || c == '-')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
} }
} }
bool Reader::readString() { bool Reader::readString() {
Char c = 0; Char c = '\0';
while (current_ != end_) { while (current_ != end_) {
c = getNextChar(); c = getNextChar();
if (c == '\\') if (c == '\\')
@ -1394,20 +1394,20 @@ bool OurReader::readNumber(bool checkInf) {
char c = '0'; // stopgap for already consumed character char c = '0'; // stopgap for already consumed character
// integral part // integral part
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
// fractional part // fractional part
if (c == '.') { if (c == '.') {
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
} }
// exponential part // exponential part
if (c == 'e' || c == 'E') { if (c == 'e' || c == 'E') {
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
if (c == '+' || c == '-') if (c == '+' || c == '-')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
while (c >= '0' && c <= '9') while (c >= '0' && c <= '9')
c = (current_ = p) < end_ ? *p++ : 0; c = (current_ = p) < end_ ? *p++ : '\0';
} }
return true; return true;
} }