From 5b2328cd6c855b7279e885fbfd3f8da7651e8a61 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 1 Nov 2015 23:03:38 -0500
Subject: [PATCH] legacy: Now uses static initialization

---
 src/legacy.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/legacy.cpp b/src/legacy.cpp
index a2efe07a3..9868951d7 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -50,11 +50,7 @@ void legacyColumnMap (std::string& name)
   // 2014-01-26: description_only     --> description.desc     Mapping removed
 
   // One-time initialization, on demand.
-  static std::map <std::string, std::string> legacyMap;
-  if (! legacyMap.size ())
-  {
-    legacyMap["priority."] = "priority";
-  }
+  static std::map <std::string, std::string> legacyMap {{"priority.", "priority"}};
 
   // If a legacy column was used, complain about it, but modify it anyway.
   auto found = legacyMap.find (name);
@@ -82,11 +78,7 @@ void legacySortColumnMap (std::string& name)
   // 2014-01-26: description_only     --> description          Mapping removed
 
   // One-time initialization, on demand.
-  static std::map <std::string, std::string> legacyMap;
-  if (! legacyMap.size ())
-  {
-    legacyMap["priority."] = "priority";
-  }
+  static std::map <std::string, std::string> legacyMap {{"priority.", "priority"}};
 
   // If a legacy column was used, complain about it, but modify it anyway.
   auto found = legacyMap.find (name);