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

Revert "convert global string "constants" to macros"

Browse Source 
This reverts commit 49b2507985.
This commit is contained in:
Michael Davidsaver
2018-02-08 11:00:40 -08:00
parent 5c1b638db5
commit b397e3e928
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ioc/PVAServerRegister.cpp
View File

@@ -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

6
src/pva/pv/pvaConstants.h
View File

@@ -73,13 +73,13 @@ const epics::pvData::int16 INVALID_DATA_TYPE = static_cast<epics::pvData::int16>
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 "<all>"
const std::string PVACCESS_ALL_PROVIDERS = "<all>";
/** Name of the system env. variable to turn on debugging. */
#define PVACCESS_DEBUG "EPICS_PVA_DEBUG"
const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG";
}
}