1 files changed, 10 insertions, 8 deletions
diff --git a/common/id/auto/driver.cxx b/common/id/auto/driver.cxx
index 19e0f14..d294e69 100644
--- a/common/id/auto/driver.cxx
+++ b/common/id/auto/driver.cxx
@@ -4,18 +4,20 @@
 // Test automatic id assignment.
 //
 
-#include <memory>   // std::auto_ptr
-#include <cassert>
+#include <memory>   // std::unique_ptr
 #include <iostream>
 
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/common.hxx>
+#include <libcommon/common.hxx>
 
 #include "test.hxx"
 #include "test-odb.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace odb::core;
 
@@ -24,7 +26,7 @@ main (int argc, char* argv[])
 {
   try
   {
-    auto_ptr<database> db (create_database (argc, argv));
+    unique_ptr<database> db (create_database (argc, argv));
 
     // object
     //
@@ -52,9 +54,9 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<object> o1 (db->load<object> (id1));
-        auto_ptr<object> o2 (db->load<object> (id2));
-        auto_ptr<object> o3 (db->load<object> (id3));
+        unique_ptr<object> o1 (db->load<object> (id1));
+        unique_ptr<object> o2 (db->load<object> (id2));
+        unique_ptr<object> o3 (db->load<object> (id3));
         t.commit ();
 
         assert (o1->id_ == id1 && o1->str_ == "one");
@@ -79,7 +81,7 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        auto_ptr<auto_only> o (db->load<auto_only> (id));
+        unique_ptr<auto_only> o (db->load<auto_only> (id));
         t.commit ();
 
         assert (o->id_ == id);