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

Merge pull request #30 from mrkraimer/master

Browse Source 
attempt to fix macos build
This commit is contained in:
Marty Kraimer
2017-10-05 09:07:51 -04:00
committed by GitHub
parent 063313f246 977f078246
commit 35d4b5c70e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/database/pvRecord.cpp
View File

@ -51,7 +51,6 @@ PVRecord::~PVRecord()
if(traceLevel>0) { if(traceLevel>0) {
cout << "~PVRecord() " << recordName << endl; cout << "~PVRecord() " << recordName << endl;
} }
// destroy();
} }
void PVRecord::initPVRecord() void PVRecord::initPVRecord()

8
src/pvAccess/channelProviderLocal.cpp
View File

@ -30,12 +30,12 @@ using std::string;
namespace epics { namespace pvDatabase { namespace epics { namespace pvDatabase {
static string providerName("local");
static ChannelProvider::shared_pointer channelProvider;
class LocalChannelProviderFactory; class LocalChannelProviderFactory;
typedef std::tr1::shared_ptr<LocalChannelProviderFactory> LocalChannelProviderFactoryPtr; typedef std::tr1::shared_ptr<LocalChannelProviderFactory> LocalChannelProviderFactoryPtr;
static string providerName("local");
static ChannelProviderLocalPtr channelProvider;
class LocalChannelProviderFactory : public ChannelProviderFactory class LocalChannelProviderFactory : public ChannelProviderFactory
{ {
public: public:
@ -43,7 +43,7 @@ public:
virtual string getFactoryName() { return providerName;} virtual string getFactoryName() { return providerName;}
virtual ChannelProvider::shared_pointer sharedInstance() virtual ChannelProvider::shared_pointer sharedInstance()
{ {
if(!channelProvider) channelProvider = ChannelProvider::shared_pointer(new ChannelProviderLocal()); if(!channelProvider) channelProvider = ChannelProviderLocalPtr(new ChannelProviderLocal());
return channelProvider; return channelProvider;
} }
virtual ChannelProvider::shared_pointer newInstance() virtual ChannelProvider::shared_pointer newInstance()