diff Framework/Common/DatabaseManager.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/Framework/Common/DatabaseManager.cpp	Mon Jul 06 12:40:44 2020 +0200
+++ b/Framework/Common/DatabaseManager.cpp	Mon Jul 06 12:45:58 2020 +0200
@@ -23,6 +23,7 @@
 
 #include "../../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
 
+#include <Compatibility.h>  // For std::unique_ptr<>
 #include <Logging.h>
 #include <OrthancException.h>
 
@@ -141,7 +142,7 @@
   {
     LOG(TRACE) << "Caching statement from " << location.GetFile() << ":" << location.GetLine();
       
-    std::auto_ptr<IPrecompiledStatement> statement(GetDatabase().Compile(query));
+    std::unique_ptr<IPrecompiledStatement> statement(GetDatabase().Compile(query));
       
     IPrecompiledStatement* tmp = statement.get();
     if (tmp == NULL)
@@ -338,7 +339,7 @@
 
   void DatabaseManager::StatementBase::SetQuery(Query* query)
   {
-    std::auto_ptr<Query> protection(query);
+    std::unique_ptr<Query> protection(query);
     
     if (query_.get() != NULL)
     {
@@ -357,7 +358,7 @@
   
   void DatabaseManager::StatementBase::SetResult(IResult* result)
   {
-    std::auto_ptr<IResult> protection(result);
+    std::unique_ptr<IResult> protection(result);
     
     if (result_.get() != NULL)
     {
@@ -504,7 +505,7 @@
   {
     try
     {
-      std::auto_ptr<Query> query(ReleaseQuery());
+      std::unique_ptr<Query> query(ReleaseQuery());
       
       if (query.get() != NULL)
       {
@@ -556,7 +557,7 @@
   {
     try
     {
-      std::auto_ptr<Query> query(ReleaseQuery());
+      std::unique_ptr<Query> query(ReleaseQuery());
       assert(query.get() != NULL);
 
       // The "statement_" object must be kept as long as the "IResult"