From 056c73faed12bdd9e7800e3e464c107ca6e6ea84 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 7 Feb 2013 08:07:00 +0200
Subject: Use auto_ptr instead of raw pointer

---
 qt/mssql/basic/driver.cxx  | 4 ++--
 qt/mysql/basic/driver.cxx  | 4 ++--
 qt/oracle/basic/driver.cxx | 2 +-
 qt/pgsql/basic/driver.cxx  | 4 ++--
 qt/sqlite/basic/driver.cxx | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'qt')

diff --git a/qt/mssql/basic/driver.cxx b/qt/mssql/basic/driver.cxx
index 9fac8de..df12334 100644
--- a/qt/mssql/basic/driver.cxx
+++ b/qt/mssql/basic/driver.cxx
@@ -52,10 +52,10 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      object* ol = db->load<object> (o.id_);
+      auto_ptr<object> p (db->load<object> (o.id_));
       t.commit ();
 
-      assert (*ol == o);
+      assert (*p == o);
     }
   }
   catch (const odb::exception& e)
diff --git a/qt/mysql/basic/driver.cxx b/qt/mysql/basic/driver.cxx
index f0cc876..68d998a 100644
--- a/qt/mysql/basic/driver.cxx
+++ b/qt/mysql/basic/driver.cxx
@@ -47,10 +47,10 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      object* ol = db->load<object> (o.str);
+      auto_ptr<object> p (db->load<object> (o.str));
       t.commit ();
 
-      assert (*ol == o);
+      assert (*p == o);
     }
   }
   catch (const odb::exception& e)
diff --git a/qt/oracle/basic/driver.cxx b/qt/oracle/basic/driver.cxx
index f50c45e..8c8f192 100644
--- a/qt/oracle/basic/driver.cxx
+++ b/qt/oracle/basic/driver.cxx
@@ -67,7 +67,7 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      std::auto_ptr<object> p (db->load<object> (o.varchar2));
+      auto_ptr<object> p (db->load<object> (o.varchar2));
       t.commit ();
       assert (*p == o);
     }
diff --git a/qt/pgsql/basic/driver.cxx b/qt/pgsql/basic/driver.cxx
index ead2470..9e0fa4d 100644
--- a/qt/pgsql/basic/driver.cxx
+++ b/qt/pgsql/basic/driver.cxx
@@ -47,10 +47,10 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      object* ol = db->load<object> (o.str);
+      auto_ptr<object> p (db->load<object> (o.str));
       t.commit ();
 
-      assert (*ol == o);
+      assert (*p == o);
     }
   }
   catch (const odb::exception& e)
diff --git a/qt/sqlite/basic/driver.cxx b/qt/sqlite/basic/driver.cxx
index c0fb883..2cff023 100644
--- a/qt/sqlite/basic/driver.cxx
+++ b/qt/sqlite/basic/driver.cxx
@@ -47,10 +47,10 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      object* ol = db->load<object> (o.str);
+      auto_ptr<object> p (db->load<object> (o.str));
       t.commit ();
 
-      assert (*ol == o);
+      assert (*p == o);
     }
   }
   catch (const odb::exception& e)
-- 
cgit v1.1