From d12a6cad9b3efbe350b55ecb1f0f1bb7c3205cf8 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 8 Feb 2018 11:32:18 -0800 Subject: [PATCH] Move PVACCESS_DEFAULT_PROVIDER def out of header --- src/pva/pv/pvaConstants.h | 8 ++++---- src/pva/pvaVersion.cpp | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pva/pv/pvaConstants.h b/src/pva/pv/pvaConstants.h index 14f2868..9ee652d 100644 --- a/src/pva/pv/pvaConstants.h +++ b/src/pva/pv/pvaConstants.h @@ -67,19 +67,19 @@ const epics::pvData::int16 PVA_DEFAULT_PRIORITY = 0; const epics::pvData::uint32 MAX_CHANNEL_NAME_LENGTH = 500; /** Invalid data type. */ -const epics::pvData::int16 INVALID_DATA_TYPE = static_cast(0xFFFF); +const epics::pvData::int16 INVALID_DATA_TYPE = 0xFFFF; /** Invalid IOID. */ const epics::pvData::int32 INVALID_IOID = 0; /** Default PVA provider name. */ -const std::string PVACCESS_DEFAULT_PROVIDER = "local"; +const std::string PVACCESS_DEFAULT_PROVIDER; /** "All-providers registered" PVA provider name. */ -const std::string PVACCESS_ALL_PROVIDERS = ""; +const std::string PVACCESS_ALL_PROVIDERS; /** Name of the system env. variable to turn on debugging. */ -const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG"; +const std::string PVACCESS_DEBUG; } } diff --git a/src/pva/pvaVersion.cpp b/src/pva/pvaVersion.cpp index b925442..f196242 100644 --- a/src/pva/pvaVersion.cpp +++ b/src/pva/pvaVersion.cpp @@ -15,6 +15,10 @@ using std::string; namespace epics { namespace pvAccess { +const std::string PVACCESS_DEFAULT_PROVIDER = "local"; +const std::string PVACCESS_ALL_PROVIDERS = ""; +const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG"; + Version::Version(std::string const & productName, std::string const & implementationLangugage, int majorVersion, int minorVersion,