Mercurial > hg > orthanc
changeset 126:52c7eb60bbc8
jsoncpp fixes
| author | jodogne |
|---|---|
| date | Fri, 05 Oct 2012 15:45:31 +0200 |
| parents | 1267071a697e |
| children | 7517cbe58623 |
| files | OrthancServer/OrthancRestApi.cpp Resources/CMake/JsonCppConfiguration.cmake |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi.cpp Fri Oct 05 15:23:20 2012 +0200 +++ b/OrthancServer/OrthancRestApi.cpp Fri Oct 05 15:45:31 2012 +0200 @@ -68,7 +68,7 @@ assert(array.isArray()); Json::Value children = Json::arrayValue; - for (size_t i = 0; i < array.size(); i++) + for (Json::Value::ArrayIndex i = 0; i < array.size(); i++) { Json::Value c; SimplifyTagsRecursion(c, array[i]); @@ -339,7 +339,7 @@ else if (index_.GetSeries(found, postData)) { // The UUID corresponds to a series - for (size_t i = 0; i < found["Instances"].size(); i++) + for (Json::Value::ArrayIndex i = 0; i < found["Instances"].size(); i++) { std::string uuid = found["Instances"][i].asString(); Json::Value instance(Json::objectValue);
--- a/Resources/CMake/JsonCppConfiguration.cmake Fri Oct 05 15:23:20 2012 +0200 +++ b/Resources/CMake/JsonCppConfiguration.cmake Fri Oct 05 15:45:31 2012 +0200 @@ -4,6 +4,7 @@ message(FATAL_ERROR "Please install the libjsoncpp-dev package") endif() + include_directories(/usr/include/jsoncpp) link_libraries(jsoncpp) else()