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

12
testApp/client/testChannelAccessFactory.cpp
View File

@@ -16,19 +16,19 @@ using namespace epics::pvAccess;
class DummyChannelProvider : public ChannelProvider {
private:
String m_name;
string m_name;
public:
DummyChannelProvider(String name) : m_name(name) {};
DummyChannelProvider(std::string name) : m_name(name) {};
void destroy() {};
String getProviderName() { return m_name; };
string getProviderName() { return m_name; };
ChannelFind* channelFind(String channelName,ChannelFindRequester *channelFindRequester)
ChannelFind* channelFind(std::string channelName,ChannelFindRequester *channelFindRequester)
{ return 0; }
Channel* createChannel(String channelName,ChannelRequester *channelRequester,short priority)
Channel* createChannel(std::string channelName,ChannelRequester *channelRequester,short priority)
{ return 0; }
Channel* createChannel(String channelName,ChannelRequester *channelRequester,short priority,String address)
Channel* createChannel(std::string channelName,ChannelRequester *channelRequester,short priority,String address)
{ return 0; }
};