From a975e8e96dd0c39e576b9e44a4c35eeef47ebe76 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 4 Sep 2015 16:17:11 +0200
Subject: Fix static initialization order issue

---
 build/variable | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build/variable')

diff --git a/build/variable b/build/variable
index 3bd8922..2aec39d 100644
--- a/build/variable
+++ b/build/variable
@@ -32,7 +32,7 @@ namespace build
   //
   struct value_type
   {
-    const std::string name;
+    const char* name;
     bool (*const assign) (names&, const variable&);
     bool (*const append) (names&, names, const variable&);
   };
@@ -437,6 +437,7 @@ namespace build
     template <typename V> static void assign (value&, V);
     template <typename V> static void append (value&, V);
 
+    static const std::string type_name;
     static const build::value_type value_type;
   };
 
@@ -566,6 +567,7 @@ namespace build
     template <typename M> static void assign (value&, M);
     template <typename M> static void append (value&, M);
 
+    static const std::string type_name;
     static const build::value_type value_type;
   };
 
-- 
cgit v1.1