From 6e717bfd30dafc164676ce9f1679f357e811da5b Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Tue, 19 Jan 2016 14:38:32 +0100
Subject: [PATCH] Switch to const constexpr for header constants (3.5/3
 internal linkage)

---
 include/engine/datafacade/shared_datatype.hpp | 5 +----
 include/extractor/travel_mode.hpp             | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/include/engine/datafacade/shared_datatype.hpp b/include/engine/datafacade/shared_datatype.hpp
index 84a9d266b..ab3004df6 100644
--- a/include/engine/datafacade/shared_datatype.hpp
+++ b/include/engine/datafacade/shared_datatype.hpp
@@ -15,11 +15,8 @@ namespace engine
 namespace datafacade
 {
 
-namespace
-{
 // Added at the start and end of each block as sanity check
-static const char CANARY[] = "OSRM";
-}
+const constexpr char CANARY[] = "OSRM";
 
 struct SharedDataLayout
 {
diff --git a/include/extractor/travel_mode.hpp b/include/extractor/travel_mode.hpp
index f5d5c23f9..1de8c2266 100644
--- a/include/extractor/travel_mode.hpp
+++ b/include/extractor/travel_mode.hpp
@@ -10,9 +10,6 @@ using TravelMode = unsigned char;
 }
 }
 
-namespace
-{
-static const osrm::extractor::TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
-static const osrm::extractor::TravelMode TRAVEL_MODE_DEFAULT = 1;
-}
+const constexpr osrm::extractor::TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
+const constexpr osrm::extractor::TravelMode TRAVEL_MODE_DEFAULT = 1;
 #endif /* TRAVEL_MODE_HPP */