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

std::auto_ptr -> epics::auto_ptr

Browse Source
This commit is contained in:
Michael Davidsaver
2017-11-06 12:37:42 -06:00
parent f91b593aea
commit 0fde239f23
4 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/pv/blockingUDP.h
View File

@@ -420,7 +420,7 @@ private:
/**
* Thread ID
*/
std::auto_ptr<epicsThread> _thread;
epics::auto_ptr<epicsThread> _thread;
epics::pvData::int8 _clientServerWithEndianFlag;

18
src/remote/transportRegistry.cpp
View File

@@ -8,7 +8,6 @@
#include <pv/transportRegistry.h>
using namespace epics::pvData;
using namespace std;
namespace epics {
namespace pvAccess {
@@ -65,14 +64,15 @@ Transport::shared_pointer TransportRegistry::get(std::string const & /*type*/, c
return Transport::shared_pointer();
}
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::get(std::string const & /*type*/, const osiSockAddr* address)
std::auto_ptr<TransportRegistry::transportVector_t>
TransportRegistry::get(std::string const & /*type*/, const osiSockAddr* address)
{
Lock guard(_mutex);
transportsMap_t::iterator transportsIter = _transports.find(address);
if(transportsIter != _transports.end())
{
prioritiesMapSharedPtr_t priorities = transportsIter->second;
auto_ptr<transportVector_t> transportArray(new transportVector_t(priorities->size()));
std::auto_ptr<transportVector_t> transportArray(new transportVector_t(priorities->size()));
int32 i = 0;
for(prioritiesMap_t::iterator prioritiesIter = priorities->begin();
prioritiesIter != priorities->end();
@@ -82,7 +82,7 @@ auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::get(std::strin
}
return transportArray;
}
return auto_ptr<transportVector_t>();
return std::auto_ptr<transportVector_t>();
}
Transport::shared_pointer TransportRegistry::remove(Transport::shared_pointer const & transport)
@@ -124,20 +124,22 @@ int32 TransportRegistry::numberOfActiveTransports()
}
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::toArray(std::string const & /*type*/)
std::auto_ptr<TransportRegistry::transportVector_t>
TransportRegistry::toArray(std::string const & /*type*/)
{
// TODO support type
return toArray();
}
auto_ptr<TransportRegistry::transportVector_t> TransportRegistry::toArray()
std::auto_ptr<TransportRegistry::transportVector_t>
TransportRegistry::toArray()
{
Lock guard(_mutex);
if (_transportCount == 0)
return auto_ptr<transportVector_t>(0);
return std::auto_ptr<transportVector_t>(0);
auto_ptr<transportVector_t> transportArray(new transportVector_t(_transportCount));
std::auto_ptr<transportVector_t> transportArray(new transportVector_t(_transportCount));
int32 i = 0;
for (transportsMap_t::iterator transportsIter = _transports.begin();

2
src/rpcService/rpcServer.cpp
View File

@@ -460,7 +460,7 @@ static void threadRunner(void* usr)
/// owned by a shared_ptr instance.
void RPCServer::runInNewThread(int seconds)
{
std::auto_ptr<ThreadRunnerParam> param(new ThreadRunnerParam());
epics::auto_ptr<ThreadRunnerParam> param(new ThreadRunnerParam());
param->server = shared_from_this();
param->timeToRun = seconds;

32
testApp/remote/testCodec.cpp
View File

@@ -424,14 +424,14 @@ public:
bool _disconnected;
int _forcePayloadRead;
std::auto_ptr<epics::pvData::ByteBuffer> _readBuffer;
epics::auto_ptr<epics::pvData::ByteBuffer> _readBuffer;
epics::pvData::ByteBuffer _writeBuffer;
std::vector<PVAMessage> _receivedAppMessages;
std::vector<PVAMessage> _receivedControlMessages;
std::auto_ptr<ReadPollOneCallback> _readPollOneCallback;
std::auto_ptr<WritePollOneCallback> _writePollOneCallback;
epics::auto_ptr<ReadPollOneCallback> _readPollOneCallback;
epics::auto_ptr<WritePollOneCallback> _writePollOneCallback;
osiSockAddr _dummyAddress;
@@ -1424,12 +1424,8 @@ private:
codec._readBuffer->setLimit(splitAt);
std::auto_ptr<ReadPollOneCallback>
readPollOneCallback(
new ReadPollOneCallbackForTestSegmentedSplitMessage
(codec, realReadBufferEnd));
codec._readPollOneCallback = readPollOneCallback;
codec._readPollOneCallback.reset(new ReadPollOneCallbackForTestSegmentedSplitMessage
(codec, realReadBufferEnd));
int32_t payloadSizeSum =
@@ -2042,13 +2038,9 @@ private:
codec._readBuffer->setLimit(splitAt);
std::auto_ptr<ReadPollOneCallback>
readPollOneCallback( new
ReadPollOneCallbackForTestSegmentedSplitConnectionLoss
(codec));
codec._readPollOneCallback = readPollOneCallback;
codec._readPollOneCallback.reset(new
ReadPollOneCallbackForTestSegmentedSplitConnectionLoss
(codec));
int32_t payloadSizeSum =
payloadSize1+payloadSize2+payloadSize3;
@@ -2628,17 +2620,13 @@ private:
codec._readBuffer.reset(
new ByteBuffer(11*DEFAULT_BUFFER_SIZE));
std::auto_ptr<WritePollOneCallback>
writePollOneCallback(
new WritePollOneCallbackForTestSendHugeMessagePartes
(codec));
std::tr1::shared_ptr<TransportSender> sender =
std::tr1::shared_ptr<TransportSender>(
new TransportSenderForTestSendHugeMessagePartes(
codec, bytesToSent));
codec._writePollOneCallback = writePollOneCallback;
codec._writePollOneCallback.reset(new WritePollOneCallbackForTestSendHugeMessagePartes
(codec));
// process