From bb99d39d0fed8187587672a143bbcea7175b9ca2 Mon Sep 17 00:00:00 2001 From: Nils Bore Date: Fri, 9 Oct 2015 18:06:23 +0200 Subject: [PATCH] merged cherry-pick --- .../include/metaroom_xml_parser/load_utilities.h | 1 - .../include/metaroom_xml_parser/load_utilities.hpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h index fcf1ddf2..92cba283 100644 --- a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h +++ b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h @@ -122,4 +122,3 @@ namespace semantic_map_registration_features } #endif - diff --git a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp index 40ad89d1..4a7bf7c1 100644 --- a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp +++ b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp @@ -308,7 +308,7 @@ sort(matchingObservations.begin(), matchingObservations.end(), [](const std::string& a, const std::string& b ) - { + { std::string patrol_string = "patrol_run_"; std::string room_string = "room_"; std::string date_string = "YYYYMMDD"; @@ -516,4 +516,3 @@ return toRet; } -