epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix for windows static build static initialisation errors.

Browse Source
This commit is contained in:
dhickin
2015-06-08 04:58:04 +01:00
parent 98da0c0bec
commit b39662450f
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/factory/FieldCreateFactory.cpp
View File

@@ -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,

7
src/pv/pvIntrospect.h
View File

@@ -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;