# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1560507398 -7200
# Node ID 84cd55245e2d287b8cdb800a7d053e0e02de2b80
# Parent  67f9c27214c504b449ba4dcd535a2cc67d1661a9# Parent  2b245953b44b74a16e097db9488de7cbfaf90a6c
Merge

diff -r 67f9c27214c5 -r 84cd55245e2d Framework/Loaders/DicomStructureSetLoader.cpp
--- a/Framework/Loaders/DicomStructureSetLoader.cpp	Fri Jun 14 12:14:16 2019 +0200
+++ b/Framework/Loaders/DicomStructureSetLoader.cpp	Fri Jun 14 12:16:38 2019 +0200
@@ -94,11 +94,12 @@
       {
         std::stringstream msg;
         msg << "Unknown resource! message.GetAnswer() = " << message.GetAnswer() << " message.GetAnswerHeaders() = ";
-        for (const auto& it : message.GetAnswerHeaders())
+        for (OrthancRestApiCommand::HttpHeaders::const_iterator it = message.GetAnswerHeaders().begin();
+             it != message.GetAnswerHeaders().end(); ++it)
         {
-          msg << "\nkey: \"" << it.first << "\" value: \"" << it.second << "\"\n";
+          msg << "\nkey: \"" << it->first << "\" value: \"" << it->second << "\"\n";
         }
-        auto msgStr = msg.str();
+        const std::string msgStr = msg.str();
         LOG(ERROR) << msgStr;
         throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource);          
       }
diff -r 67f9c27214c5 -r 84cd55245e2d Framework/Scene2DViewport/ViewportController.cpp
--- a/Framework/Scene2DViewport/ViewportController.cpp	Fri Jun 14 12:14:16 2019 +0200
+++ b/Framework/Scene2DViewport/ViewportController.cpp	Fri Jun 14 12:16:38 2019 +0200
@@ -50,10 +50,10 @@
     throw StoneException(ErrorCode_NotImplemented);
   }
 
-  std::vector<boost::shared_ptr<MeasureTool>> ViewportController::HitTestMeasureTools(
+  std::vector<boost::shared_ptr<MeasureTool> > ViewportController::HitTestMeasureTools(
     ScenePoint2D p)
   {
-    std::vector<boost::shared_ptr<MeasureTool>> ret;
+    std::vector<boost::shared_ptr<MeasureTool> > ret;
     
     for (size_t i = 0; i < measureTools_.size(); ++i)
     {
diff -r 67f9c27214c5 -r 84cd55245e2d Framework/Scene2DViewport/ViewportController.h
--- a/Framework/Scene2DViewport/ViewportController.h	Fri Jun 14 12:14:16 2019 +0200
+++ b/Framework/Scene2DViewport/ViewportController.h	Fri Jun 14 12:16:38 2019 +0200
@@ -87,7 +87,7 @@
     (in scene coords). A tracker can then be requested from the chosen 
     measure tool, if needed
     */
-    std::vector<boost::shared_ptr<MeasureTool>> HitTestMeasureTools(ScenePoint2D p);
+    std::vector<boost::shared_ptr<MeasureTool> > HitTestMeasureTools(ScenePoint2D p);
 
     /**
     With this method, the object takes ownership of the supplied tracker and
@@ -172,7 +172,7 @@
   private:
     double GetCanvasToSceneFactor() const;
 
-    std::vector<boost::shared_ptr<TrackerCommand>> commandStack_;
+    std::vector<boost::shared_ptr<TrackerCommand> > commandStack_;
     
     /**
     This is always between >= 0 and <= undoStack_.size() and gives the 
@@ -181,8 +181,8 @@
     - If numAppliedCommands_ < numAppliedCommands_.size(), one can redo
     */
     size_t                      numAppliedCommands_;
-    std::vector<boost::shared_ptr<MeasureTool>> measureTools_;
-    boost::shared_ptr<Scene2D>                  scene_;
+    std::vector<boost::shared_ptr<MeasureTool> > measureTools_;
+    boost::shared_ptr<Scene2D>                   scene_;
     boost::shared_ptr<IFlexiblePointerTracker>   tracker_;
     
     // this is cached