From 907801bacc542813759d6191cfd01bc26dff6648 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 2 Mar 2012 14:11:03 +0200
Subject: Reimplement C++11 support to be header-only

This way, the same build of the runtime libraries can be used in both
C++98 and C++11 modes. This is important for when runtimes are installed
or packaged.
---
 odb/sqlite/database.cxx | 4 ++--
 odb/sqlite/database.hxx | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/odb/sqlite/database.cxx b/odb/sqlite/database.cxx
index cd62a1c..74c32d1 100644
--- a/odb/sqlite/database.cxx
+++ b/odb/sqlite/database.cxx
@@ -35,7 +35,7 @@ namespace odb
           foreign_keys_ (foreign_keys),
           factory_ (factory.transfer ())
     {
-      if (factory_.get () == 0)
+      if (!factory_)
         factory_.reset (new connection_pool_factory ());
 
       factory_->database (*this);
@@ -74,7 +74,7 @@ namespace odb
         throw cli_exception (ostr.str ());
       }
 
-      if (factory_.get () == 0)
+      if (!factory_)
         factory_.reset (new connection_pool_factory ());
 
       factory_->database (*this);
diff --git a/odb/sqlite/database.hxx b/odb/sqlite/database.hxx
index d2bf61f..021a5df 100644
--- a/odb/sqlite/database.hxx
+++ b/odb/sqlite/database.hxx
@@ -14,7 +14,7 @@
 #include <iosfwd> // std::ostream
 
 #include <odb/database.hxx>
-#include <odb/details/config.hxx>       // ODB_CXX11
+#include <odb/details/unique-ptr.hxx>
 #include <odb/details/transfer-ptr.hxx>
 
 #include <odb/sqlite/version.hxx>
@@ -133,12 +133,7 @@ namespace odb
       std::string name_;
       int flags_;
       bool foreign_keys_;
-
-#ifdef ODB_CXX11
-      std::unique_ptr<connection_factory> factory_;
-#else
-      std::auto_ptr<connection_factory> factory_;
-#endif
+      details::unique_ptr<connection_factory> factory_;
     };
   }
 }
-- 
cgit v1.1