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

clang compilation fixes

Browse Source
This commit is contained in:
Matej Sekoranja
2014-10-16 07:30:42 +02:00
parent 9f45bdfa75
commit f1c39ca5d2
15 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exampleDatabase/src/exampleDatabase.cpp
View File

@@ -150,7 +150,7 @@ void ExampleDatabase::create()
recordName = "examplePowerSupply";
PVStructurePtr pvStructure = createPowerSupply();
PowerSupplyPtr psr = PowerSupply::create(recordName,pvStructure);
if(psr==NULL) {
if(!psr) {
cout << "PowerSupply::create failed" << endl;
} else {
result = master->addRecord(psr);
@@ -158,7 +158,7 @@ void ExampleDatabase::create()
}
recordName = "laptoprecordListPGRPC";
pvRecord = RecordListRecord::create(recordName);
if(pvRecord==NULL) {
if(!pvRecord) {
cout << "RecordListRecord::create failed" << endl;
} else {
result = master->addRecord(pvRecord);

6
exampleDatabase/src/exampleMonitorPlugin.cpp
View File

@@ -42,10 +42,10 @@ public:
{
pvField = getPVDataCreate()->createPVField(field);
raiseMonitor = true;
if(pvFieldOptions!=NULL) {
if(pvFieldOptions) {
PVStringPtr pvString =
pvFieldOptions->getSubField<PVString>("raiseMonitor");
if(pvString!=NULL) {
if(pvString) {
string value = pvString->get();
if(value.compare("false")==0) raiseMonitor = false;
}
@@ -90,7 +90,7 @@ void ExampleMonitorPlugin::create()
static OnChangePluginCreatorPtr plugin;
static Mutex mutex;
Lock xx(mutex);
if(plugin==NULL) {
if(!plugin) {
plugin = OnChangePluginCreatorPtr(new OnChangePluginCreator());
MonitorPluginManager::get()->addPlugin(pluginName,plugin);
}