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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-10-02 13:48:32 +02:00
commit aee6420943
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -457,6 +457,7 @@ if (DEFINED WITH_SANITY )
endif() endif()
add_executable(MistOutHTTP add_executable(MistOutHTTP
${BINARY_DIR}/mist/.headers
src/output/mist_out.cpp src/output/mist_out.cpp
src/output/output.cpp src/output/output.cpp
src/output/output_http.cpp src/output/output_http.cpp

14
lib/json.cpp
View file

@ -1196,7 +1196,8 @@ std::string JSON::Value::toString() const {
} }
case DOUBLE: { case DOUBLE: {
std::stringstream st; std::stringstream st;
st << dblVal; st.precision(10);
st << std::fixed << dblVal;
return st.str(); return st.str();
break; break;
} }
@ -1260,10 +1261,19 @@ std::string JSON::Value::toPrettyString(int indentation) const {
} }
case DOUBLE: { case DOUBLE: {
std::stringstream st; std::stringstream st;
st << dblVal; st.precision(10);
st << std::fixed << dblVal;
return st.str(); return st.str();
break; break;
} }
case BOOL: {
if (intVal != 0){
return "true";
}else{
return "false";
}
break;
}
case STRING: { case STRING: {
for (unsigned int i = 0; i < 201 && i < strVal.size(); ++i) { for (unsigned int i = 0; i < 201 && i < strVal.size(); ++i) {
if (strVal[i] < 32 || strVal[i] > 126 || strVal.size() > 200) { if (strVal[i] < 32 || strVal[i] > 126 || strVal.size() > 200) {