← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug-1210677-archive into lp:zorba/archive-module

 

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1210677-archive into lp:zorba/archive-module.

Commit message:
Replace auto_ptr with unique_ptr.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1210677-archive/+merge/184934
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1210677-archive/+merge/184934
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2013-08-06 22:13:42 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-09-11 04:41:09 +0000
@@ -1213,7 +1213,7 @@
     // return all entries if no second arg is given
     bool lReturnAll = aArgs.size() == 1;
 
-    std::auto_ptr<ExtractItemSequence> lSeq(
+    std::unique_ptr<ExtractItemSequence> lSeq(
         new ExtractTextItemSequence(lArchive, lReturnAll, lEncoding));
 
     // get the names of all entries that should be retruned
@@ -1304,7 +1304,7 @@
     // return all entries if no second arg is given
     bool lReturnAll = aArgs.size() == 1;
 
-    std::auto_ptr<ExtractItemSequence> lSeq(
+    std::unique_ptr<ExtractItemSequence> lSeq(
         new ExtractBinaryItemSequence(lArchive, lReturnAll));
 
     // get the names of all entries that should be retruned
@@ -1483,7 +1483,7 @@
     Item lArchive = getOneItem(aArgs, 0);
 
     //Initialize an Update Iterator with the Archive recived from the function
-    std::auto_ptr<UpdateItemSequence> lSeq(
+    std::unique_ptr<UpdateItemSequence> lSeq(
     new UpdateItemSequence(lArchive, false));
 
     std::vector<ArchiveEntry> lEntries;
@@ -1559,7 +1559,7 @@
     //Base64 Binary of the Archive
     Item lArchive = getOneItem(aArgs, 0);
 
-    std::auto_ptr<DeleteItemSequence> lSeq(
+    std::unique_ptr<DeleteItemSequence> lSeq(
       new DeleteItemSequence(lArchive));
 
     //set list of files to delete from the archive.


References