From b397e3e9286f3822a78755a9cb1e2678437be31d Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 8 Feb 2018 11:00:40 -0800 Subject: [PATCH] Revert "convert global string "constants" to macros" This reverts commit 49b250798570bdc9c5451a4a79ab03dbcb09e233. --- src/ioc/PVAServerRegister.cpp | 2 +- src/pva/pv/pvaConstants.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ioc/PVAServerRegister.cpp b/src/ioc/PVAServerRegister.cpp index 6360914..fbee91f 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", PVACCESS_ALL_PROVIDERS) + .add("EPICS_PVAS_PROVIDER_NAMES", pva::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 408d96f..14f2868 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. */ -#define PVACCESS_DEFAULT_PROVIDER "local" +const std::string PVACCESS_DEFAULT_PROVIDER = "local"; /** "All-providers registered" PVA provider name. */ -#define PVACCESS_ALL_PROVIDERS "" +const std::string PVACCESS_ALL_PROVIDERS = ""; /** Name of the system env. variable to turn on debugging. */ -#define PVACCESS_DEBUG "EPICS_PVA_DEBUG" +const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG"; } }