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

be explicit about epics::auto_ptr

Browse Source
This commit is contained in:
Michael Davidsaver
2017-11-06 12:46:13 -06:00
parent 9bf03fbfbe
commit dcb74b781d
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/blockingUDPTransport.cpp
View File

@@ -559,7 +559,7 @@ void initializeUDPTransports(bool serverFlag,
const std::string& ignoreAddressList)
{
TransportClient::shared_pointer nullTransportClient;
auto_ptr<BlockingUDPConnector> connector(new BlockingUDPConnector(serverFlag, true, true));
epics::auto_ptr<BlockingUDPConnector> connector(new BlockingUDPConnector(serverFlag, true, true));
//
// Create UDP transport for sending (to all network interfaces)

2
src/remoteClient/clientContextImpl.cpp
View File

@@ -4613,7 +4613,7 @@ private:
/**
* PVA connector (creates PVA virtual circuit).
*/
auto_ptr<BlockingTCPConnector> m_connector;
epics::auto_ptr<BlockingTCPConnector> m_connector;
/**
* PVA transport (virtual circuit) registry.

8
testApp/remote/testServer.cpp
View File

@@ -2687,16 +2687,16 @@ private:
Channel::shared_pointer m_mpChannel;
ProcessAction m_scan1Hz;
auto_ptr<epics::pvData::Thread> m_scan1HzThread;
epics::auto_ptr<epics::pvData::Thread> m_scan1HzThread;
ProcessAction m_scan10Hz;
auto_ptr<epics::pvData::Thread> m_scan10HzThread;
epics::auto_ptr<epics::pvData::Thread> m_scan10HzThread;
ADCAction m_adcAction;
auto_ptr<epics::pvData::Thread> m_adcThread;
epics::auto_ptr<epics::pvData::Thread> m_adcThread;
NTNDArrayAction m_imgAction;
auto_ptr<epics::pvData::Thread> m_imgThread;
epics::auto_ptr<epics::pvData::Thread> m_imgThread;
};
string MockServerChannelProvider::PROVIDER_NAME = "local";

2
testApp/utils/testInetAddressUtils.cpp
View File

@@ -145,7 +145,7 @@ void test_encodeAsIPv6Address()
{
testDiag("Test encodeAsIPv6Address()");
auto_ptr<ByteBuffer> buff(new ByteBuffer(32, EPICS_ENDIAN_LITTLE));
epics::auto_ptr<ByteBuffer> buff(new ByteBuffer(32, EPICS_ENDIAN_LITTLE));
char src[] = { (char)0, (char)0, (char)0, (char)0, (char)0, (char)0,
(char)0, (char)0, (char)0, (char)0, (char)0xFF, (char)0xFF,

2
testApp/utils/transportRegistryTest.cpp
View File

@@ -90,7 +90,7 @@ typedef std::vector<osiSockAddr*> osiSockAddrVector_t;
int main(int argc, char *argv[])
{
registry = new TransportRegistry();
auto_ptr<TransportRegistry::transportVector_t> transportArrayOut;
epics::auto_ptr<TransportRegistry::transportVector_t> transportArrayOut;
std::vector<Transport::shared_pointer> transportArrayIn (address_max * priority_max);
osiSockAddrVector_t addrArray (address_max);
//address