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

const-ify string constants

Browse Source 
yes really...
This commit is contained in:
Michael Davidsaver
2018-05-18 10:12:34 -07:00
parent 6abfe9d196
commit 6ccca1ce58
11 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testApp/remote/channelAccessIFTest.cpp
View File

@ -32,17 +32,17 @@ namespace TR1 = std::tr1;
// int value, 1Hz increment by one
std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
const std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
// int value, increment on process
std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
const std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
// double value, NTScalar
std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
const std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
// double value
std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
const std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
// RPC sum service: int a + int b -> int c
std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
const std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
// double[] value
std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
const std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
#ifdef ENABLE_STRESS_TESTS
#define EXTRA_STRESS_TESTS 5

12
testApp/remote/channelAccessIFTest.h
View File

@ -16,12 +16,12 @@ public:
protected:
static std::string TEST_COUNTER_CHANNEL_NAME;
static std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static std::string TEST_CHANNEL_NAME;
static std::string TEST_VALUEONLY_CHANNEL_NAME;
static std::string TEST_SUMRPC_CHANNEL_NAME;
static std::string TEST_ARRAY_CHANNEL_NAME;
static const std::string TEST_COUNTER_CHANNEL_NAME;
static const std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static const std::string TEST_CHANNEL_NAME;
static const std::string TEST_VALUEONLY_CHANNEL_NAME;
static const std::string TEST_SUMRPC_CHANNEL_NAME;
static const std::string TEST_ARRAY_CHANNEL_NAME;
ChannelProvider::shared_pointer getChannelProvider() { return m_provider; }

4
testApp/remote/testServer.cpp
View File

@ -2515,7 +2515,7 @@ public:
typedef std::tr1::shared_ptr<MockServerChannelProvider> shared_pointer;
typedef std::tr1::shared_ptr<const MockServerChannelProvider> const_shared_pointer;
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
MockServerChannelProvider() :
m_mockChannelFind(),
@ -2699,7 +2699,7 @@ private:
epics::auto_ptr<epics::pvData::Thread> m_imgThread;
};
string MockServerChannelProvider::PROVIDER_NAME = "local";
const string MockServerChannelProvider::PROVIDER_NAME = "local";
struct TestServer
{