changeset 663:95b4c6d89c42

fix for visual studio
author jodogne
date Wed, 06 Nov 2013 17:18:40 +0100
parents 70161eb45b5c
children 855adbdd75a6
files OrthancServer/OrthancRestApi.cpp
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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<std::string> tmp;
         context.GetIndex().GetChildInstances(tmp, stripped);
-        instances.merge(tmp);
-        assert(tmp.empty());
+
+        for (std::list<std::string>::const_iterator
+          it = tmp.begin(); it != tmp.end(); ++it)
+        {
+          instances.push_back(*it);
+        }
       }
     }
     else