From b39662450ff715d3fe6ae6b0ead2d70d24874d82 Mon Sep 17 00:00:00 2001
From: dhickin <fdavid.hickin@diamond.ac.uk>
Date: Mon, 8 Jun 2015 04:58:04 +0100
Subject: [PATCH] Fix for windows static build static initialisation errors.

---
 src/factory/FieldCreateFactory.cpp | 28 ++++++++++++++++++++++------
 src/pv/pvIntrospect.h              |  7 +++++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp
index 302dcfa..c4f8bb7 100644
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -399,7 +399,13 @@ void UnionArray::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*co
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
-string Structure::DEFAULT_ID = "structure";
+string Structure::DEFAULT_ID = Structure::defaultId();
+
+string & Structure::defaultId()
+{
+    static string id = "structure";
+    return id;
+}
 
 Structure::Structure (
     StringArray const & fieldNames,
@@ -531,20 +537,30 @@ void Structure::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*con
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
-string Union::DEFAULT_ID = "union";
+string Union::DEFAULT_ID = Union::defaultId();
 
-#define UNION_ANY_ID "any"
-string Union::ANY_ID = UNION_ANY_ID;
+string & Union::defaultId()
+{
+    static string id = "union";
+    return id;
+}
+
+string Union::ANY_ID = Union::anyId();
+
+string & Union::anyId()
+{
+    static string id = "any";
+    return id;
+}
 
 Union::Union ()
 : Field(union_),
       fieldNames(),
       fields(),
-      id(UNION_ANY_ID)
+      id(anyId())
 {
 }
 
-#undef UNION_ANY_ID
 
 Union::Union (
     StringArray const & fieldNames,
diff --git a/src/pv/pvIntrospect.h b/src/pv/pvIntrospect.h
index 1d339be..071b7b0 100644
--- a/src/pv/pvIntrospect.h
+++ b/src/pv/pvIntrospect.h
@@ -650,6 +650,7 @@ public:
      * Default structure ID.
      */
     static std::string DEFAULT_ID;
+    static std::string & defaultId();
 
     /**
      * Destructor.
@@ -730,7 +731,7 @@ public:
     virtual void deserialize(ByteBuffer *buffer, DeserializableControl *control);
     
 protected:
-    Structure(StringArray const & fieldNames, FieldConstPtrArray const & fields, std::string const & id = DEFAULT_ID);
+    Structure(StringArray const & fieldNames, FieldConstPtrArray const & fields, std::string const & id = defaultId());
 private:
     StringArray fieldNames;
     FieldConstPtrArray fields;
@@ -754,11 +755,13 @@ public:
      * Default union ID.
      */
     static std::string DEFAULT_ID;
+    static std::string & defaultId();
 
     /**
      * Default variant union ID.
      */
     static std::string ANY_ID;
+    static std::string & anyId();
 
     /**
      * Destructor.
@@ -845,7 +848,7 @@ public:
     
 protected:
    Union();
-   Union(StringArray const & fieldNames, FieldConstPtrArray const & fields, std::string const & id = DEFAULT_ID);
+   Union(StringArray const & fieldNames, FieldConstPtrArray const & fields, std::string const & id = defaultId());
 private:
    StringArray fieldNames;
    FieldConstPtrArray fields;