diff MySQL/UnitTests/UnitTestsMain.cpp @ 157:275e14f57f1e

replacing deprecated std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jul 2020 12:45:58 +0200
parents 063aa53b5917
children 3236894320d6
line wrap: on
line diff
--- a/MySQL/UnitTests/UnitTestsMain.cpp	Mon Jul 06 12:40:44 2020 +0200
+++ b/MySQL/UnitTests/UnitTestsMain.cpp	Mon Jul 06 12:45:58 2020 +0200
@@ -31,6 +31,7 @@
 #include "../../Framework/MySQL/MySQLTransaction.h"
 #include "../../Framework/Plugins/IndexUnitTests.h"
 
+#include <Compatibility.h>  // For std::unique_ptr<>
 #include <HttpClient.h>
 #include <Logging.h>
 #include <Toolbox.h>
@@ -138,7 +139,7 @@
   OrthancDatabases::MySQLStatement s(db, query);
   OrthancDatabases::MySQLTransaction t(db);
   OrthancDatabases::Dictionary d;
-  std::auto_ptr<OrthancDatabases::IResult> result(s.Execute(t, d));
+  std::unique_ptr<OrthancDatabases::IResult> result(s.Execute(t, d));
   return dynamic_cast<const OrthancDatabases::Integer64Value&>(result->GetField(0)).GetValue();
 }
 
@@ -215,15 +216,15 @@
   }
 
   {
-    std::auto_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(false));
+    std::unique_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(false));
     ASSERT_FALSE(t->IsImplicit());
   }
 
   {
     OrthancDatabases::Query query("CREATE TABLE test(id INT)", false);
-    std::auto_ptr<OrthancDatabases::IPrecompiledStatement> s(db.Compile(query));
+    std::unique_ptr<OrthancDatabases::IPrecompiledStatement> s(db.Compile(query));
     
-    std::auto_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(true));
+    std::unique_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(true));
     ASSERT_TRUE(t->IsImplicit());
     ASSERT_THROW(t->Commit(), Orthanc::OrthancException);
     ASSERT_THROW(t->Rollback(), Orthanc::OrthancException);
@@ -239,9 +240,9 @@
   {
     // An implicit transaction does not need to be explicitely committed
     OrthancDatabases::Query query("CREATE TABLE test2(id INT)", false);
-    std::auto_ptr<OrthancDatabases::IPrecompiledStatement> s(db.Compile(query));
+    std::unique_ptr<OrthancDatabases::IPrecompiledStatement> s(db.Compile(query));
     
-    std::auto_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(true));
+    std::unique_ptr<OrthancDatabases::ITransaction> t(db.CreateTransaction(true));
 
     OrthancDatabases::Dictionary args;
     t->ExecuteWithoutResult(*s, args);