From 439bc0ff201f38025d224ce421c86ca44f3dc063 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Feb 2012 12:46:48 +0200
Subject: Test std::shared_ptr in C++11 mode and std::tr1::shared_ptr in C++98
 mode

---
 common/relationship-query/driver.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'common/relationship-query/driver.cxx')

diff --git a/common/relationship-query/driver.cxx b/common/relationship-query/driver.cxx
index 56d1f14..58bbef5 100644
--- a/common/relationship-query/driver.cxx
+++ b/common/relationship-query/driver.cxx
@@ -13,7 +13,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <common/config.hxx> // HAVE_TR1_MEMORY
+#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
 #include <common/common.hxx>
 
 #include "test.hxx"
@@ -29,9 +29,7 @@ main (int argc, char* argv[])
   {
     auto_ptr<database> db (create_database (argc, argv));
 
-#ifdef HAVE_TR1_MEMORY
-
-    using std::tr1::shared_ptr;
+#if defined(HAVE_CXX11) || defined(HAVE_TR1_MEMORY)
 
     //
     //
@@ -164,7 +162,8 @@ main (int argc, char* argv[])
       t.commit ();
     }
 
-#endif
+#endif // HAVE_CXX11 || HAVE_TR1_MEMORY
+
   }
   catch (const odb::exception& e)
   {
-- 
cgit v1.1