diff --git a/src/ioc/PVAServerRegister.cpp b/src/ioc/PVAServerRegister.cpp index fbee91f..6360914 100644 --- a/src/ioc/PVAServerRegister.cpp +++ b/src/ioc/PVAServerRegister.cpp @@ -46,7 +46,7 @@ void startitup() { the_server = pva::ServerContext::create(pva::ServerContext::Config() .config(pva::ConfigurationBuilder() // default to all providers instead of just "local" - .add("EPICS_PVAS_PROVIDER_NAMES", pva::PVACCESS_ALL_PROVIDERS) + .add("EPICS_PVAS_PROVIDER_NAMES", PVACCESS_ALL_PROVIDERS) .push_map() // prefer to use EPICS_PVAS_PROVIDER_NAMES // from environment diff --git a/src/pva/pv/pvaConstants.h b/src/pva/pv/pvaConstants.h index 14f2868..408d96f 100644 --- a/src/pva/pv/pvaConstants.h +++ b/src/pva/pv/pvaConstants.h @@ -73,13 +73,13 @@ const epics::pvData::int16 INVALID_DATA_TYPE = static_cast const epics::pvData::int32 INVALID_IOID = 0; /** Default PVA provider name. */ -const std::string PVACCESS_DEFAULT_PROVIDER = "local"; +#define PVACCESS_DEFAULT_PROVIDER "local" /** "All-providers registered" PVA provider name. */ -const std::string PVACCESS_ALL_PROVIDERS = ""; +#define PVACCESS_ALL_PROVIDERS "" /** Name of the system env. variable to turn on debugging. */ -const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG"; +#define PVACCESS_DEBUG "EPICS_PVA_DEBUG" } }