Replace deprecated std::auto_ptr with std::unique_ptr

This is to avoid getting flooded with deprecation warnings when compiling this project.
cms-externals · Dec 29, 2021 · f5903ed · f5903ed
1 parent 51f58a6
commit f5903ed
Show file tree

Hide file tree

Showing 89 changed files with 270 additions and 297 deletions.
diff --git a/CORAL_SERVER/CoralAuthenticationService/src/CredentialsTable.cpp b/CORAL_SERVER/CoralAuthenticationService/src/CredentialsTable.cpp
@@ -167,7 +167,7 @@ void CredentialsTable::listCredentials( const std::string& physConStr,
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "db" );
@@ -204,7 +204,7 @@ bool CredentialsTable::existCredentials( const std::string& physConStr,
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "db" );
@@ -231,7 +231,7 @@ const AuthenticationCredentials CredentialsTable::getCredentials( const std::str
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "db" );

diff --git a/CORAL_SERVER/CoralAuthenticationService/src/LC2PCTable.cpp b/CORAL_SERVER/CoralAuthenticationService/src/LC2PCTable.cpp
@@ -199,7 +199,7 @@ bool LC2PCTable::LC2PCExists( bool wildcards,
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "" );
@@ -241,7 +241,7 @@ DatabaseServiceSet* LC2PCTable::lookup( const std::string& logicalName, AccessMo
   coral::AttributeList whereData;
   std::string whereString="";
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->addToTableList( defaultTableName(), "" );
 
@@ -286,7 +286,7 @@ unsigned int LC2PCTable::getNextOrderNo( const std::string& logConStr)
   coral::AttributeList whereData;
   std::string whereString="";
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->addToTableList( defaultTableName(), "" );
 

diff --git a/CORAL_SERVER/CoralAuthenticationService/src/LogConTable.cpp b/CORAL_SERVER/CoralAuthenticationService/src/LogConTable.cpp
@@ -91,7 +91,7 @@ bool LogConTable::logConExists( const std::string& logConStr )
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "" );

diff --git a/CORAL_SERVER/CoralAuthenticationService/src/PhysConTable.cpp b/CORAL_SERVER/CoralAuthenticationService/src/PhysConTable.cpp
@@ -92,7 +92,7 @@ bool PhysConTable::physConExists( const std::string& physConStr )
   coral::AttributeList rowBuffer;
   m_table.dataEditor().rowBuffer( rowBuffer );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->defineOutput( rowBuffer );
   query->addToTableList( defaultTableName(), "" );

diff --git a/CORAL_SERVER/CoralAuthenticationService/src/QueryMgr.cpp b/CORAL_SERVER/CoralAuthenticationService/src/QueryMgr.cpp
@@ -178,8 +178,8 @@ void QueryMgr::addPermission( const std::string& lcString, const std::string& pc
   {
     // we have to resolve a logical connection string
 
-    //std::auto_ptr<IOperationWithQuery> operation( m_permTable.dataEditor().insertWithQuery() );
-    std::auto_ptr<IOperationWithQuery> operation( m_schema.tableHandle(PermissionsTable::defaultTableName()).dataEditor().insertWithQuery() );
+    //std::unique_ptr<IOperationWithQuery> operation( m_permTable.dataEditor().insertWithQuery() );
+    std::unique_ptr<IOperationWithQuery> operation( m_schema.tableHandle(PermissionsTable::defaultTableName()).dataEditor().insertWithQuery() );
 
     IQueryDefinition *query( &operation->query() );
     coral::AttributeList outputBuffer;
@@ -451,7 +451,7 @@ void QueryMgr::queryConnections(
                                 const std::string& user, const std::string& dbRole )
 {
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   // main query is on credentials table
   query->addToTableList( m_crTable.defaultTableName(), "cr" );
@@ -642,7 +642,7 @@ const AuthenticationCredentials QueryMgr::getCredentials( const std::string& phy
   if ( cert == 0 )
     return m_crTable.getCredentials( physConStr, dbRole );
 
-  std::auto_ptr<IQuery> query( m_schema.newQuery() );
+  std::unique_ptr<IQuery> query( m_schema.newQuery() );
 
   query->addToTableList( m_crTable.defaultTableName(), "cr" );
   query->addToTableList( m_permTable.defaultTableName(), "perm" );

diff --git a/CORAL_SERVER/CoralAuthenticationService/tests/QueryMgr/test_QueryMgr.cpp b/CORAL_SERVER/CoralAuthenticationService/tests/QueryMgr/test_QueryMgr.cpp
@@ -205,7 +205,7 @@ namespace coral
         CPPUNIT_FAIL("test logical 2 connection not added");
 
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -221,7 +221,7 @@ namespace coral
       if ( !mgr.m_pcTable.physConExists( "roTestPhysConStr" ) )
         CPPUNIT_FAIL("test connection 3 not added");
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -230,7 +230,7 @@ namespace coral
                                       set->replica(1).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 3, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -248,7 +248,7 @@ namespace coral
       if ( !mgr.m_pcTable.physConExists( "roTestPhysConStr2" ) )
         CPPUNIT_FAIL("test connection 4 not added");
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -257,7 +257,7 @@ namespace coral
                                       set->replica(1).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 4, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -303,7 +303,7 @@ namespace coral
         CPPUNIT_FAIL("test logical connection not deleted");
 
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 0, set->numberOfReplicas() );
       }
@@ -331,7 +331,7 @@ namespace coral
         CPPUNIT_FAIL("test logical 2 connection not added");
 
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -347,7 +347,7 @@ namespace coral
       if ( !mgr.m_pcTable.physConExists( "roTestPhysConStr" ) )
         CPPUNIT_FAIL("test connection 3 not added");
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -356,7 +356,7 @@ namespace coral
                                       set->replica(1).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 3, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -375,7 +375,7 @@ namespace coral
         CPPUNIT_FAIL("test connection 4 not added");
 
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -384,7 +384,7 @@ namespace coral
                                       set->replica(1).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 4, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr"),
@@ -401,14 +401,14 @@ namespace coral
       mgr.delConnection("testLogConStr" /* lcString*/, "testPhysConStr" /*pcString*/,
                         "" /*user*/, "" /*role*/ );
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 1, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
                                       set->replica(0).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 3, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
@@ -423,14 +423,14 @@ namespace coral
       mgr.delConnection("testLogConStr" /* lcString*/, "roTestPhysConStr2" /*pcString*/,
                         "" /*user*/, "" /*role*/ );
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 1, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
                                       set->replica(0).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 2, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
@@ -442,14 +442,14 @@ namespace coral
       mgr.delConnection("testLogConStr" /* lcString*/, "roTestPhysConStr" /*pcString*/,
                         "" /*user*/, "" /*role*/ );
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 1, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
                                       set->replica(0).connectionString() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 1, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 2 ", std::string("testPhysConStr2"),
@@ -459,12 +459,12 @@ namespace coral
       mgr.delConnection("testLogConStr" /* lcString*/, "testPhysConStr2" /*pcString*/,
                         "" /*user*/, "" /*role*/ );
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 0, set->numberOfReplicas() );
       }
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("testLogConStr", ReadOnly, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 0, set->numberOfReplicas() );
       }
@@ -582,7 +582,7 @@ namespace coral
         CPPUNIT_FAIL("test logical connection not added");
 
       {
-        std::auto_ptr<DatabaseServiceSet> set( mgr.lookup("alias1", Update, "") );
+        std::unique_ptr<DatabaseServiceSet> set( mgr.lookup("alias1", Update, "") );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "number of replicas", 1, set->numberOfReplicas() );
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "replica 1 ", std::string("testPhysConStr25"),

diff --git a/CORAL_SERVER/CoralServer/src/CoralServerFacade.cpp b/CORAL_SERVER/CoralServer/src/CoralServerFacade.cpp
@@ -336,7 +336,7 @@ CoralServerFacade::fetchAllRows( coral::Token sessionID,
   IQuery* query = QueryMgr::newQuery( pOutputBuffer, *session, qd );
   return IRowIteratorPtr( new CursorIterator( *query ) );
   /*
-  std::auto_ptr<IQuery> query( QueryMgr::newQuery( pOutputBuffer, *session, qd ) );
+  std::unique_ptr<IQuery> query( QueryMgr::newQuery( pOutputBuffer, *session, qd ) );
   ICursor& cursor = query->execute();
   std::vector<AttributeList> rows;
   while ( cursor.next() ) rows.push_back( cursor.currentRow() );
@@ -372,7 +372,7 @@ CoralServerFacade::fetchAllRows( coral::Token sessionID,
   IQuery* query = QueryMgr::newQuery( outputTypes, *session, qd );
   return IRowIteratorPtr( new CursorIterator( *query ) );
   /*
-  std::auto_ptr<IQuery> query( QueryMgr::newQuery( outputTypes, *session, qd ) );
+  std::unique_ptr<IQuery> query( QueryMgr::newQuery( outputTypes, *session, qd ) );
   ICursor& cursor = query->execute();
   std::vector<AttributeList> rows;
   while ( cursor.next() ) rows.push_back( cursor.currentRow() );

diff --git a/CORAL_SERVER/CoralServerBase/CoralServerBase/ICoralFacade.h b/CORAL_SERVER/CoralServerBase/CoralServerBase/ICoralFacade.h
@@ -20,7 +20,7 @@ namespace coral
   typedef unsigned int Token;
 
   /// Row iterator pointer.
-  typedef std::auto_ptr<IRowIterator> IRowIteratorPtr;
+  typedef std::unique_ptr<IRowIterator> IRowIteratorPtr;
 
   /** @class ICoralFacade
    *

diff --git a/CORAL_SERVER/CoralServerBase/CoralServerBase/IRequestHandler.h b/CORAL_SERVER/CoralServerBase/CoralServerBase/IRequestHandler.h
@@ -13,7 +13,7 @@ namespace coral
   class ICertificateData;
 
   /// Buffer iterator pointer.
-  typedef std::auto_ptr<IByteBufferIterator> IByteBufferIteratorPtr;
+  typedef std::unique_ptr<IByteBufferIterator> IByteBufferIteratorPtr;
 
   /** @class IRequestHandler
    *

diff --git a/CORAL_SERVER/CoralServerBase/CoralServerBase/QueryDefinition.h b/CORAL_SERVER/CoralServerBase/CoralServerBase/QueryDefinition.h
@@ -162,8 +162,8 @@ namespace coral
     AttributeList m_conditionData;
     std::string m_groupBy;
     std::vector< std::string > m_orderList;
-    std::auto_ptr< std::pair<int,int> > m_rowLimitAndOffset;
-    std::auto_ptr< std::pair<SetOperation,QueryDefinition> > m_setOperation;
+    std::unique_ptr< std::pair<int,int> > m_rowLimitAndOffset;
+    std::unique_ptr< std::pair<SetOperation,QueryDefinition> > m_setOperation;
 
   };
 

diff --git a/CORAL_SERVER/CoralServerProxy/src/Packet.cpp b/CORAL_SERVER/CoralServerProxy/src/Packet.cpp
@@ -369,7 +369,7 @@ Packet::write ( NetSocket& socket, const CTLPacketHeader& ctlh  )
 
     // make buffer big enough
 #ifdef __APPLE__
-    std::auto_ptr<unsigned char> aBuf( new unsigned char[psize] );
+    std::unique_ptr<unsigned char> aBuf( new unsigned char[psize] );
     unsigned char* buf = aBuf.get();
 #else
     unsigned char buf[psize] ;

diff --git a/CORAL_SERVER/CoralSockets/CoralSockets/SocketServer.h b/CORAL_SERVER/CoralSockets/CoralSockets/SocketServer.h
@@ -67,7 +67,7 @@ namespace coral {
       int m_nHandlerThreadsPerSocket;
 
       /// a thread manager
-      std::auto_ptr<ThreadManager> m_thrManager;
+      std::unique_ptr<ThreadManager> m_thrManager;
 
     };
 

diff --git a/CORAL_SERVER/CoralSockets/src/DummyRequestHandler.cpp b/CORAL_SERVER/CoralSockets/src/DummyRequestHandler.cpp
@@ -151,7 +151,7 @@ DummyRequestHandler::replyToRequest( const ByteBuffer& request )
       num=10;
 
     unsigned int count=0;
-    std::auto_ptr<SimpleReplyIterator> iterator;
+    std::unique_ptr<SimpleReplyIterator> iterator;
     do {
       std::stringstream stream;
       stream <<"Thank you for your request " << count << " '";
@@ -165,7 +165,7 @@ DummyRequestHandler::replyToRequest( const ByteBuffer& request )
 
       count++;
       if ( iterator.get() == 0 )
-        iterator = std::auto_ptr<SimpleReplyIterator>(
+        iterator = std::unique_ptr<SimpleReplyIterator>(
                                                       new SimpleReplyIterator( reply, false ) );
       else
         iterator->addBuffer( reply, count>=num );

diff --git a/CORAL_SERVER/CoralSockets/src/PacketSocket.cpp b/CORAL_SERVER/CoralSockets/src/PacketSocket.cpp
@@ -157,7 +157,7 @@ PacketPtr PacketSocket::receivePacket( )
       throw GenericSocketException("PANIC! packet size ==0?!",
                                    "PacketSocket::receivePacket()");
     // receive the payload
-    std::auto_ptr<ByteBuffer> payload( new ByteBuffer(
+    std::unique_ptr<ByteBuffer> payload( new ByteBuffer(
                                                       ctlHeader.packetSize()-CTLPACKET_HEADER_SIZE ) );
     DEBUG("reading payload" << std::endl);
     m_socket->readAll( payload->data(), payload->freeSize() );

diff --git a/CORAL_SERVER/CoralSockets/src/PacketSocket.h b/CORAL_SERVER/CoralSockets/src/PacketSocket.h
@@ -20,7 +20,7 @@ namespace coral
 
       /// constructor for receiving
       PacketSLAC( CTLPacketHeader & header,
-                  std::auto_ptr<ByteBuffer> payload)
+                  std::unique_ptr<ByteBuffer> payload)
         : m_payload( payload )
         , m_payloadRef( *m_payload)
         , m_header( header)
@@ -79,15 +79,15 @@ namespace coral
         return m_payloadRef;
       }
 
-      std::auto_ptr<ByteBuffer>& getPayloadPointer()
+      std::unique_ptr<ByteBuffer>& getPayloadPointer()
       {
         return m_payload;
       }
 
     private:
 
       /// payload buffer (only when owned by PacketSLAC)
-      std::auto_ptr<ByteBuffer> m_payload;
+      std::unique_ptr<ByteBuffer> m_payload;
 
       /// payload reference
       const ByteBuffer& m_payloadRef;