use std::unique_ptr instead of auto_ptr

as proposed in #4

Author: aumuell

src/refimpl/E57FoundationImpl.cpp

@@ -98,7 +98,7 @@ using std::ios_base;
 using std::scientific;
 using std::setprecision;
 using std::string;
-using std::auto_ptr;
+using std::unique_ptr;
 using std::min;
 using std::max;
 
@@ -3815,7 +3815,7 @@ void ImageFileImpl::construct2(const ustring& fileName, const ustring& mode, con
              throw E57_EXCEPTION2(E57_ERROR_XML_PARSER_INIT, "parserMessage=" + ustring(XMLString::transcode(ex.getMessage())));
         }
 
-        xmlReader = XMLReaderFactory::createXMLReader(); //??? auto_ptr?
+        xmlReader = XMLReaderFactory::createXMLReader(); //??? unique_ptr?
 
         //??? check these are right
         xmlReader->setFeature(XMLUni::fgSAX2CoreValidation,        true);
@@ -6290,7 +6290,7 @@ CompressedVectorReaderImpl::CompressedVectorReaderImpl(shared_ptr<CompressedVect
     /// Verify that packet given by dataPhysicalOffset is actually a data packet, init channels
     {
         char* anyPacket = NULL;
-        auto_ptr<PacketLock> packetLock = cache_->lock(dataLogicalOffset, anyPacket);
+        unique_ptr<PacketLock> packetLock = cache_->lock(dataLogicalOffset, anyPacket);
 
         DataPacket* dpkt = reinterpret_cast<DataPacket*>(anyPacket);
 
@@ -6453,7 +6453,7 @@ void CompressedVectorReaderImpl::feedPacketToDecoders(uint64_t currentPacketLogi
     {
         /// Get packet at currentPacketLogicalOffset into memory.
         char* anyPacket = NULL;
-        auto_ptr<PacketLock> packetLock = cache_->lock(currentPacketLogicalOffset, anyPacket);
+        unique_ptr<PacketLock> packetLock = cache_->lock(currentPacketLogicalOffset, anyPacket);
         DataPacket* dpkt = reinterpret_cast<DataPacket*>(anyPacket);
 
         /// Double check that have a data packet.  Should have already determined this.
@@ -6520,7 +6520,7 @@ void CompressedVectorReaderImpl::feedPacketToDecoders(uint64_t currentPacketLogi
         if (nextPacketLogicalOffset < E57_UINT64_MAX) { //??? huh?
             /// Get packet at nextPacketLogicalOffset into memory.
             char* anyPacket = NULL;
-            auto_ptr<PacketLock> packetLock = cache_->lock(nextPacketLogicalOffset, anyPacket);
+            unique_ptr<PacketLock> packetLock = cache_->lock(nextPacketLogicalOffset, anyPacket);
             DataPacket* dpkt = reinterpret_cast<DataPacket*>(anyPacket);
 
             /// Got a data packet, update the channels with exhausted input
@@ -6569,7 +6569,7 @@ uint64_t CompressedVectorReaderImpl::findNextDataPacket(uint64_t nextPacketLogic
     /// Starting at nextPacketLogicalOffset, search for next data packet until hit end of binary section.
     while (nextPacketLogicalOffset < sectionEndLogicalOffset_) {
         char* anyPacket = NULL;
-        auto_ptr<PacketLock> packetLock = cache_->lock(nextPacketLogicalOffset, anyPacket);
+        unique_ptr<PacketLock> packetLock = cache_->lock(nextPacketLogicalOffset, anyPacket);
 
         /// Guess it's a data packet, if not continue to next packet
         DataPacket* dpkt = reinterpret_cast<DataPacket*>(anyPacket);
@@ -7819,7 +7819,7 @@ PacketReadCache::~PacketReadCache()
     }
 }
 
-auto_ptr<PacketLock> PacketReadCache::lock(uint64_t packetLogicalOffset, char* &pkt)
+unique_ptr<PacketLock> PacketReadCache::lock(uint64_t packetLogicalOffset, char* &pkt)
 {
 #ifdef E57_MAX_VERBOSE
     cout << "PacketReadCache::lock() called, packetLogicalOffset=" << packetLogicalOffset << endl;
@@ -7847,7 +7847,7 @@ auto_ptr<PacketLock> PacketReadCache::lock(uint64_t packetLogicalOffset, char* &
             pkt = entries_[i].buffer_;
 
             /// Create lock so we are sure that we will be unlocked when use is finished.
-            auto_ptr<PacketLock> plock(new PacketLock(this, i));
+            unique_ptr<PacketLock> plock(new PacketLock(this, i));
 
             /// Increment cache lock just before return
             lockCount_++;
@@ -7875,7 +7875,7 @@ auto_ptr<PacketLock> PacketReadCache::lock(uint64_t packetLogicalOffset, char* &
     pkt = entries_[oldestEntry].buffer_;
 
     /// Create lock so we are sure we will be unlocked when use is finished.
-    auto_ptr<PacketLock> plock(new PacketLock(this, oldestEntry));
+    unique_ptr<PacketLock> plock(new PacketLock(this, oldestEntry));
 
     /// Increment cache lock just before return
     lockCount_++;

src/refimpl/E57FoundationImpl.h

@@ -1368,7 +1368,7 @@ class PacketReadCache {
                         PacketReadCache(CheckedFile* cFile, unsigned packetCount);
                         ~PacketReadCache();
 
-    std::auto_ptr<PacketLock> lock(uint64_t packetLogicalOffset, char* &pkt);  //??? pkt could be const
+    std::unique_ptr<PacketLock> lock(uint64_t packetLogicalOffset, char* &pkt);  //??? pkt could be const
     void                 markDiscarable(uint64_t packetLogicalOffset);
 
 #ifdef E57_DEBUG
@@ -1773,7 +1773,7 @@ void SeekIndexReader::lookup(uint64_t recordNumber, uint64_t& foundRecordNumber,
     for (unsigned level = indexDepth_-1; level >= 0; level--) {
         /// Get index packet at packetOffset into cache and get pointer
         char* pkt;
-        auto_ptr<PacketLock> plock = imf_->cache()->lock(nextPacketOffset, pkt);
+        unique_ptr<PacketLock> plock = imf_->cache()->lock(nextPacketOffset, pkt);
         IndexPacket* ipkt = reinterpret_cast<IndexPacket*>(pkt);
 
         /// Quick check that packet looks ok
@@ -1848,7 +1848,7 @@ void SeekIndexReader::lookup(uint64_t recordNumber, uint64_t& foundRecordNumber,
     for (unsigned level = indexDepth_-1; level >= 0; level--) {
         /// Get index packet at packetOffset into cache and get pointer
         char* pkt;
-        auto_ptr<PacketLock> plock = imf_->cache()->lock(nextPacketOffset, pkt);
+        unique_ptr<PacketLock> plock = imf_->cache()->lock(nextPacketOffset, pkt);
         IndexPacket* ipkt = reinterpret_cast<IndexPacket*>(pkt);
 
         /// Quick check that packet looks ok