From 26a35bb3b0f1df0145fb8cd4e6514ca8fef4da76 Mon Sep 17 00:00:00 2001
From: Anton Alkin <anton.alkin@cern.ch>
Date: Wed, 27 Jan 2021 19:46:52 +0100
Subject: [PATCH 1/2] remove leftover namespace

---
 Framework/Core/src/PropertyTreeHelpers.cxx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Framework/Core/src/PropertyTreeHelpers.cxx b/Framework/Core/src/PropertyTreeHelpers.cxx
index f965a8579e3d8..595be48b95cb6 100644
--- a/Framework/Core/src/PropertyTreeHelpers.cxx
+++ b/Framework/Core/src/PropertyTreeHelpers.cxx
@@ -99,11 +99,6 @@ void PropertyTreeHelpers::populateDefaults(std::vector<ConfigParamSpec> const& s
   }
 }
 
-namespace
-{
-
-} // namespace
-
 void PropertyTreeHelpers::populate(std::vector<ConfigParamSpec> const& schema,
                                    boost::property_tree::ptree& pt,
                                    boost::program_options::variables_map const& vmap,

From 3a72e3c3f3168776786d6e4714e382cee8743464 Mon Sep 17 00:00:00 2001
From: Anton Alkin <anton.alkin@cern.ch>
Date: Wed, 27 Jan 2021 20:06:51 +0100
Subject: [PATCH 2/2] use predefined strings

---
 .../Core/include/Framework/VariantPropertyTreeHelpers.h   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Framework/Core/include/Framework/VariantPropertyTreeHelpers.h b/Framework/Core/include/Framework/VariantPropertyTreeHelpers.h
index 5bc5f78310cc4..7c83b30a12333 100644
--- a/Framework/Core/include/Framework/VariantPropertyTreeHelpers.h
+++ b/Framework/Core/include/Framework/VariantPropertyTreeHelpers.h
@@ -92,8 +92,8 @@ auto array2DFromBranch(boost::property_tree::ptree const& branch)
 template <typename T>
 auto labeledArrayFromBranch(boost::property_tree::ptree const& tree)
 {
-  auto labels_rows = vectorFromBranch<std::string>(tree.get_child("labels_rows"));
-  auto labels_cols = vectorFromBranch<std::string>(tree.get_child("labels_cols"));
+  auto labels_rows = vectorFromBranch<std::string>(tree.get_child(labels_rows_str));
+  auto labels_cols = vectorFromBranch<std::string>(tree.get_child(labels_cols_str));
   auto values = array2DFromBranch<T>(tree.get_child("values"));
 
   return LabeledArray<T>{values, labels_rows, labels_cols};
@@ -103,8 +103,8 @@ template <typename T>
 auto labeledArrayToBranch(LabeledArray<T>&& array)
 {
   boost::property_tree::ptree subtree;
-  subtree.put_child("labels_rows", vectorToBranch(array.getLabelsRows()));
-  subtree.put_child("lanels_cols", vectorToBranch(array.getLabelsCols()));
+  subtree.put_child(labels_rows_str, vectorToBranch(array.getLabelsRows()));
+  subtree.put_child(labels_cols_str, vectorToBranch(array.getLabelsCols()));
   subtree.put_child("values", array2DToBranch(array.getData()));
 
   return subtree;