# HG changeset patch # User Sebastien Jodogne # Date 1560325945 -7200 # Node ID 2b245953b44b74a16e097db9488de7cbfaf90a6c # Parent 266e2b0b9abc6dd611d4caf28f0af3486aa10117 removed some c++11 for older compilers diff -r 266e2b0b9abc -r 2b245953b44b Framework/Loaders/DicomStructureSetLoader.cpp --- a/Framework/Loaders/DicomStructureSetLoader.cpp Tue Jun 11 15:41:21 2019 +0200 +++ b/Framework/Loaders/DicomStructureSetLoader.cpp Wed Jun 12 09:52:25 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 266e2b0b9abc -r 2b245953b44b Framework/Scene2DViewport/ViewportController.cpp --- a/Framework/Scene2DViewport/ViewportController.cpp Tue Jun 11 15:41:21 2019 +0200 +++ b/Framework/Scene2DViewport/ViewportController.cpp Wed Jun 12 09:52:25 2019 +0200 @@ -50,10 +50,10 @@ throw StoneException(ErrorCode_NotImplemented); } - std::vector> ViewportController::HitTestMeasureTools( + std::vector > ViewportController::HitTestMeasureTools( ScenePoint2D p) { - std::vector> ret; + std::vector > ret; for (size_t i = 0; i < measureTools_.size(); ++i) { diff -r 266e2b0b9abc -r 2b245953b44b Framework/Scene2DViewport/ViewportController.h --- a/Framework/Scene2DViewport/ViewportController.h Tue Jun 11 15:41:21 2019 +0200 +++ b/Framework/Scene2DViewport/ViewportController.h Wed Jun 12 09:52:25 2019 +0200 @@ -87,7 +87,7 @@ (in scene coords). A tracker can then be requested from the chosen measure tool, if needed */ - std::vector> HitTestMeasureTools(ScenePoint2D p); + std::vector > 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> commandStack_; + std::vector > 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> measureTools_; - boost::shared_ptr scene_; + std::vector > measureTools_; + boost::shared_ptr scene_; boost::shared_ptr tracker_; // this is cached