fix global string constants

This commit is contained in:
Michael Davidsaver
2018-10-04 20:56:12 -07:00
parent 605c172d3c
commit 48770f132f
2 changed files with 8 additions and 6 deletions

View File

@@ -18,6 +18,7 @@
# define epicsExportSharedSymbols
# undef pvaConstantsepicsExportSharedSymbols
#endif
#include <shareLib.h>
namespace epics {
namespace pvAccess {
@@ -73,13 +74,13 @@ const epics::pvData::int16 INVALID_DATA_TYPE = 0xFFFF;
const epics::pvData::int32 INVALID_IOID = 0;
/** Default PVA provider name. */
const std::string PVACCESS_DEFAULT_PROVIDER;
epicsShareExtern const std::string PVACCESS_DEFAULT_PROVIDER;
/** "All-providers registered" PVA provider name. */
const std::string PVACCESS_ALL_PROVIDERS;
epicsShareExtern const std::string PVACCESS_ALL_PROVIDERS;
/** Name of the system env. variable to turn on debugging. */
const std::string PVACCESS_DEBUG;
epicsShareExtern const std::string PVACCESS_DEBUG;
}
}

View File

@@ -8,6 +8,7 @@
#define epicsExportSharedSymbols
#include <pv/pvaVersion.h>
#include <pv/pvaConstants.h>
using std::stringstream;
using std::string;
@@ -15,9 +16,9 @@ using std::string;
namespace epics {
namespace pvAccess {
const std::string PVACCESS_DEFAULT_PROVIDER = "local";
const std::string PVACCESS_ALL_PROVIDERS = "<all>";
const std::string PVACCESS_DEBUG = "EPICS_PVA_DEBUG";
const std::string PVACCESS_DEFAULT_PROVIDER("local");
const std::string PVACCESS_ALL_PROVIDERS("<all>");
const std::string PVACCESS_DEBUG("EPICS_PVA_DEBUG");
Version::Version(std::string const & productName,
std::string const & implementationLangugage,