From 91ecff4ba2f199cbd50f4622484139518dbe32a7 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Sun, 16 Oct 2011 18:24:10 +0200 Subject: [PATCH] Pre-Merge --- DDV_Controller/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DDV_Controller/main.cpp b/DDV_Controller/main.cpp index c99405b8..3f0f8e6b 100644 --- a/DDV_Controller/main.cpp +++ b/DDV_Controller/main.cpp @@ -90,9 +90,10 @@ void Authorize( Json::Value & Request, Json::Value & Storage, Json::Value & Resp } void CheckConfig(Json::Value & in, Json::Value & out){ - Json::ValueIterator jit; +printf( "In:\t%s\n", in.toStyledString().c_str() ); +printf( "Out:\t%s\n", out.toStyledString().c_str() ); if (in.isObject()){ - for (jit = in.begin(); jit != in.end(); jit++){ + for( Json::Value::iterator jit = in.begin(); jit != in.end(); jit++){ if (out.isObject() && out.isMember(jit.memberName())){ Log("CONF", std::string("Updated configuration value ")+jit.memberName(), out); }else{ @@ -100,7 +101,7 @@ void CheckConfig(Json::Value & in, Json::Value & out){ } } if (out.isObject()){ - for (jit = out.begin(); jit != out.end(); jit++){ + for ( Json::Value::iterator jit = out.begin(); jit != out.end(); jit++){ if (!in.isMember(jit.memberName())){ Log("CONF", std::string("Deleted configuration value ")+jit.memberName(), out); }