From dcb74b781ddc082a434239428500d44d066d3f31 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 6 Nov 2017 12:46:13 -0600
Subject: [PATCH] be explicit about epics::auto_ptr

---
 src/remote/blockingUDPTransport.cpp     | 2 +-
 src/remoteClient/clientContextImpl.cpp  | 2 +-
 testApp/remote/testServer.cpp           | 8 ++++----
 testApp/utils/testInetAddressUtils.cpp  | 2 +-
 testApp/utils/transportRegistryTest.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp
index 3cce149..27421be 100644
--- a/src/remote/blockingUDPTransport.cpp
+++ b/src/remote/blockingUDPTransport.cpp
@@ -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)
diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index b6be788..b0f51df 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -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.
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index c5aff96..7aceadf 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -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";
diff --git a/testApp/utils/testInetAddressUtils.cpp b/testApp/utils/testInetAddressUtils.cpp
index 0d839a6..b70d35a 100644
--- a/testApp/utils/testInetAddressUtils.cpp
+++ b/testApp/utils/testInetAddressUtils.cpp
@@ -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,
diff --git a/testApp/utils/transportRegistryTest.cpp b/testApp/utils/transportRegistryTest.cpp
index 9702952..f2fe4fe 100644
--- a/testApp/utils/transportRegistryTest.cpp
+++ b/testApp/utils/transportRegistryTest.cpp
@@ -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