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

String -> std::string, toString methods removed

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-19 14:29:41 +02:00
parent 2287c857ea
commit ba4102639e
55 changed files with 652 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
testApp/remote/testServerContext.cpp
View File

@@ -13,10 +13,10 @@ class TestChannelProvider : public ChannelProvider
{
public:
epics::pvData::String getProviderName() { return "local"; };
std::string getProviderName() { return "local"; };
ChannelFind::shared_pointer channelFind(epics::pvData::String const & /*channelName*/,
ChannelFind::shared_pointer channelFind(std::string const & /*channelName*/,
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
ChannelFind::shared_pointer nullCF;
@@ -33,7 +33,7 @@ public:
}
Channel::shared_pointer createChannel(
epics::pvData::String const & channelName,
std::string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short priority = PRIORITY_DEFAULT)
{
@@ -41,9 +41,9 @@ public:
}
Channel::shared_pointer createChannel(
epics::pvData::String const & /*channelName*/,
std::string const & /*channelName*/,
ChannelRequester::shared_pointer const & channelRequester,
short /*priority*/, epics::pvData::String const & /*address*/)
short /*priority*/, std::string const & /*address*/)
{
Channel::shared_pointer nullC;
channelRequester->channelCreated(Status::Ok, nullC);
@@ -61,7 +61,7 @@ public:
virtual ~TestChannelProviderRegistry() {};
ChannelProvider::shared_pointer getProvider(epics::pvData::String const & providerName)
ChannelProvider::shared_pointer getProvider(std::string const & providerName)
{
if (providerName == "local")
{
@@ -71,7 +71,7 @@ public:
return ChannelProvider::shared_pointer();
}
ChannelProvider::shared_pointer createProvider(epics::pvData::String const & providerName)
ChannelProvider::shared_pointer createProvider(std::string const & providerName)
{
return getProvider(providerName);
}