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

String -> std::string, toString methods removed, take 2

Browse Source
This commit is contained in:
Matej Sekoranja
2014-06-19 14:55:44 +02:00
parent c39b966121
commit 8ce42ebb9a
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exampleServer/src/exampleServer.cpp
View File

@@ -12,14 +12,16 @@
#include <pv/standardPVField.h>
#include <pv/exampleServer.h>
namespace epics { namespace exampleServer {
using namespace epics::pvData;
using namespace epics::pvDatabase;
using std::tr1::static_pointer_cast;
using std::string;
namespace epics { namespace exampleServer {
ExampleServerPtr ExampleServer::create(
String const & recordName)
string const & recordName)
{
StandardPVFieldPtr standardPVField = getStandardPVField();
PVDataCreatePtr pvDataCreate = getPVDataCreate();
@@ -41,7 +43,7 @@ ExampleServerPtr ExampleServer::create(
}
ExampleServer::ExampleServer(
String const & recordName,
string const & recordName,
PVStructurePtr const & pvStructure)
: PVRecord(recordName,pvStructure)
{
@@ -71,7 +73,7 @@ bool ExampleServer::init()
void ExampleServer::process()
{
pvResultValue->put(String("Hello ") + pvArgumentValue->get());
pvResultValue->put(string("Hello ") + pvArgumentValue->get());
timeStamp.getCurrent();
pvTimeStamp.set(timeStamp);
}

2
exampleServer/src/exampleServerMain.cpp
View File

@@ -38,7 +38,7 @@ int main(int argc,char *argv[])
ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
PVRecordPtr pvRecord;
bool result(false);
String recordName;
string recordName;
recordName = "exampleServer";
pvRecord = ExampleServer::create(recordName);
result = master->addRecord(pvRecord);