restore use of PVACCESS_ALL_RPOVIDERS

epics-base · Mar 13, 2018 · 26d066f · 26d066f
1 parent 5db28b0
commit 26d066f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/pvaccess/PvaServer.cpp b/src/pvaccess/PvaServer.cpp
@@ -9,30 +9,29 @@
 #include "InvalidRequest.h"
 #include "PvaServer.h"
 
-const char* PvaServer::AllProviders("<all>");
 PvaPyLogger PvaServer::logger("PvaServer");
 
 PvaServer::PvaServer() :
     recordMap()
 {
     epics::pvDatabase::ChannelProviderLocalPtr channelProvider = epics::pvDatabase::getChannelProviderLocal();
-    server = epics::pvAccess::startPVAServer(AllProviders, 0, true, true);
+    server = epics::pvAccess::startPVAServer(epics::pvAccess::PVACCESS_ALL_PROVIDERS, 0, true, true);
 }
 
 PvaServer::PvaServer(const std::string& channelName, const PvObject& pvObject) :
     recordMap()
 {
     initRecord(channelName, pvObject);
     epics::pvDatabase::ChannelProviderLocalPtr channelProvider = epics::pvDatabase::getChannelProviderLocal();
-    server = epics::pvAccess::startPVAServer(AllProviders, 0, true, true);
+    server = epics::pvAccess::startPVAServer(epics::pvAccess::PVACCESS_ALL_PROVIDERS, 0, true, true);
 }
 
 PvaServer::PvaServer(const std::string& channelName, const PvObject& pvObject, const boost::python::object& onWriteCallback) :
     recordMap()
 {
     initRecord(channelName, pvObject, onWriteCallback);
     epics::pvDatabase::ChannelProviderLocalPtr channelProvider = epics::pvDatabase::getChannelProviderLocal();
-    server = epics::pvAccess::startPVAServer(AllProviders, 0, true, true);
+    server = epics::pvAccess::startPVAServer(epics::pvAccess::PVACCESS_ALL_PROVIDERS, 0, true, true);
 }
 
 PvaServer::~PvaServer() 

diff --git a/src/pvaccess/PvaServer.h b/src/pvaccess/PvaServer.h
@@ -17,8 +17,6 @@
 class PvaServer 
 {
 public:
-    static const char* AllProviders;
-
     PvaServer();
     PvaServer(const std::string& channelName, const PvObject& pvObject);
     PvaServer(const std::string& channelName, const PvObject& pvObject, const boost::python::object& onWriteCallback);