fix static build
This commit is contained in:
@ -83,7 +83,7 @@ static std::string toLowerCase(const std::string& input)
|
|||||||
// Data distributor class
|
// Data distributor class
|
||||||
|
|
||||||
static std::string name("distributor");
|
static std::string name("distributor");
|
||||||
bool DataDistributorPlugin::initialized(DataDistributorPlugin::initialize());
|
bool DataDistributorPlugin::initialized(false);
|
||||||
|
|
||||||
std::map<std::string, DataDistributorPtr> DataDistributor::dataDistributorMap;
|
std::map<std::string, DataDistributorPtr> DataDistributor::dataDistributorMap;
|
||||||
epics::pvData::Mutex DataDistributor::dataDistributorMapMutex;
|
epics::pvData::Mutex DataDistributor::dataDistributorMapMutex;
|
||||||
@ -275,8 +275,11 @@ void DataDistributorPlugin::create()
|
|||||||
|
|
||||||
bool DataDistributorPlugin::initialize()
|
bool DataDistributorPlugin::initialize()
|
||||||
{
|
{
|
||||||
|
if (not initialized) {
|
||||||
|
initialized = true;
|
||||||
DataDistributorPluginPtr pvPlugin = DataDistributorPluginPtr(new DataDistributorPlugin());
|
DataDistributorPluginPtr pvPlugin = DataDistributorPluginPtr(new DataDistributorPlugin());
|
||||||
PVPluginRegistry::registerPlugin(name,pvPlugin);
|
PVPluginRegistry::registerPlugin(name,pvPlugin);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "pv/pvArrayPlugin.h"
|
#include "pv/pvArrayPlugin.h"
|
||||||
#include "pv/pvTimestampPlugin.h"
|
#include "pv/pvTimestampPlugin.h"
|
||||||
#include "pv/pvDeadbandPlugin.h"
|
#include "pv/pvDeadbandPlugin.h"
|
||||||
|
#include "pv/dataDistributorPlugin.h"
|
||||||
|
|
||||||
using std::tr1::static_pointer_cast;
|
using std::tr1::static_pointer_cast;
|
||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
@ -44,6 +45,7 @@ PVDatabasePtr PVDatabase::getMaster()
|
|||||||
PVArrayPlugin::create();
|
PVArrayPlugin::create();
|
||||||
PVTimestampPlugin::create();
|
PVTimestampPlugin::create();
|
||||||
PVDeadbandPlugin::create();
|
PVDeadbandPlugin::create();
|
||||||
|
DataDistributorPlugin::create();
|
||||||
}
|
}
|
||||||
return pvDatabaseMaster;
|
return pvDatabaseMaster;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user