# HG changeset patch # User jodogne # Date 1383754720 -3600 # Node ID 95b4c6d89c428d37172f08af0af8ab8361daa921 # Parent 70161eb45b5c1ca7aeac89259c5a716690cc7818 fix for visual studio diff -r 70161eb45b5c -r 95b4c6d89c42 OrthancServer/OrthancRestApi.cpp --- a/OrthancServer/OrthancRestApi.cpp Wed Nov 06 16:19:25 2013 +0100 +++ b/OrthancServer/OrthancRestApi.cpp Wed Nov 06 17:18:40 2013 +0100 @@ -315,8 +315,12 @@ std::list tmp; context.GetIndex().GetChildInstances(tmp, stripped); - instances.merge(tmp); - assert(tmp.empty()); + + for (std::list::const_iterator + it = tmp.begin(); it != tmp.end(); ++it) + { + instances.push_back(*it); + } } } else