zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1210677-sqlite into lp:zorba/sqlite-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-sqlite/+merge/184932


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1210677-sqlite/+merge/184932
Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module.

=== modified file 'src/sqlite_module.xq.src/sqlite_module.cpp'
--- src/sqlite_module.xq.src/sqlite_module.cpp	2013-07-30 00:38:13 +0000
+++ src/sqlite_module.xq.src/sqlite_module.cpp	2013-09-11 04:40:26 +0000
@@ -1077,7 +1077,7 @@
 
     // Once we got the SQL Query executed just pass it to the JSON Sequence
     // so it will return what we need to the user
-    std::auto_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
+    std::unique_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
     return ItemSequence_t(lSeq.release());
   }
 
@@ -1105,7 +1105,7 @@
 
     // Once we got the SQL Query executed just pass it to the JSON Sequence
     // after we get the result we convert it to a integer Item
-    std::auto_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
+    std::unique_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
     Iterator_t lIter = lSeq->getIterator();
     lIter->open();
     lIter->next(lItemRes);
@@ -1147,7 +1147,7 @@
 
     // So now create a JSONMetadataItemSequence and let it
     // get us what we need
-    std::auto_ptr<JSONMetadataItemSequence> lSeq(new JSONMetadataItemSequence(lPstmt));
+    std::unique_ptr<JSONMetadataItemSequence> lSeq(new JSONMetadataItemSequence(lPstmt));
     lIter = lSeq->getIterator();
     lIter->open();
     while(lIter->next(lVecItem))
@@ -1383,7 +1383,7 @@
                  getErrorMessage("INVALID-PREPARED-STATEMENT"));
 
     // And let the JSONItemSequence execute it
-    std::auto_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
+    std::unique_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
     return ItemSequence_t(lSeq.release());
   }
 
@@ -1407,7 +1407,7 @@
                  getErrorMessage("INVALID-PREPARED-STATEMENT"));
 
     // And let the JSONItemSequence execute it
-    std::auto_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
+    std::unique_ptr<JSONItemSequence> lSeq(new JSONItemSequence(lPstmt));
     Iterator_t lIter = lSeq->getIterator();
     lIter->open();
     lIter->next(lItemRes);