# HG changeset patch # User Sebastien Jodogne # Date 1432904445 -7200 # Node ID 772c8507c68dbcd91003787c1e198e91f528d028 # Parent 5c11c4e728ebb848538a24e6a57cb45f21cd7356# Parent d6971e18a324c716bb197126fce4a64321ffa082 integration mainline->query-retrieve diff -r 5c11c4e728eb -r 772c8507c68d OrthancServer/DicomFindQuery.cpp --- a/OrthancServer/DicomFindQuery.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/DicomFindQuery.cpp Fri May 29 15:00:45 2015 +0200 @@ -205,7 +205,7 @@ DicomFindQuery::~DicomFindQuery() { for (Constraints::iterator it = constraints_.begin(); - it != constraints_.end(); it++) + it != constraints_.end(); ++it) { delete it->second; } diff -r 5c11c4e728eb -r 772c8507c68d OrthancServer/OrthancRestApi/OrthancRestResources.cpp --- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp Fri May 29 15:00:45 2015 +0200 @@ -53,7 +53,7 @@ Json::Value answer = Json::arrayValue; for (std::list::const_iterator - resource = resources.begin(); resource != resources.end(); resource++) + resource = resources.begin(); resource != resources.end(); ++resource) { if (expand) { diff -r 5c11c4e728eb -r 772c8507c68d OrthancServer/ResourceFinder.cpp --- a/OrthancServer/ResourceFinder.cpp Fri May 29 14:46:55 2015 +0200 +++ b/OrthancServer/ResourceFinder.cpp Fri May 29 15:00:45 2015 +0200 @@ -204,7 +204,7 @@ filtered_.clear(); for (std::list::const_iterator - it = resources.begin(); it != resources.end(); it++) + it = resources.begin(); it != resources.end(); ++it) { DicomMap mainTags; if (index_.GetMainDicomTags(mainTags, *it, level_)) diff -r 5c11c4e728eb -r 772c8507c68d Plugins/Samples/ServeFolders/Plugin.cpp --- a/Plugins/Samples/ServeFolders/Plugin.cpp Fri May 29 14:46:55 2015 +0200 +++ b/Plugins/Samples/ServeFolders/Plugin.cpp Fri May 29 15:00:45 2015 +0200 @@ -222,7 +222,7 @@ std::string s = "

Additional folders served by Orthanc

::const_iterator - it = folders_.begin(); it != folders_.end(); it++) + it = folders_.begin(); it != folders_.end(); ++it) { s += "

first + "/index.html\">" + it->first + "

\n"; } @@ -270,7 +270,7 @@ // Register the callback for each base URI for (Json::Value::Members::const_iterator - it = members.begin(); it != members.end(); it++) + it = members.begin(); it != members.end(); ++it) { const std::string& baseUri = *it; const std::string path = configuration["ServeFolders"][*it].asString();