hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed JSON lib automatic conversion from string to long long int.

Browse source
This commit is contained in:
Thulinma 2012-05-01 15:10:59 +02:00
parent 59d81223c8
commit aaecc7e983
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
util/json.cpp
View file

@ -3,6 +3,7 @@
#include "json.h" #include "json.h"
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
#include <stdlib.h>
int JSON::Value::c2hex(int c){ int JSON::Value::c2hex(int c){
if (c >= '0' && c <= '9') return c - '0'; if (c >= '0' && c <= '9') return c - '0';
@ -252,9 +253,15 @@ JSON::Value & JSON::Value::operator=(const unsigned int &rhs){
return ((*this) = (long long int)rhs); return ((*this) = (long long int)rhs);
} }
/// Automatic conversion to long long int - returns 0 if not an integer type. /// Automatic conversion to long long int - returns 0 if not convertable.
JSON::Value::operator long long int(){ JSON::Value::operator long long int(){
return intVal; if (myType == INTEGER){
return intVal;
}
if (myType == STRING){
return atoll(strVal.c_str());
}
return 0;
} }