From c55878df67c400d9ac940ee2d8dbd6e922af5ac3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Mar 2012 12:32:02 +0200
Subject: Resolve tr1/std::shared_ptr ambiguities

---
 inverse/driver.cxx       | 2 ++
 relationship/driver.cxx  | 4 +++-
 schema/custom/driver.cxx | 2 ++
 view/driver.cxx          | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/inverse/driver.cxx b/inverse/driver.cxx
index 9184e4f..d521579 100644
--- a/inverse/driver.cxx
+++ b/inverse/driver.cxx
@@ -39,6 +39,8 @@ print (const employee& e)
 int
 main (int argc, char* argv[])
 {
+  using tr1::shared_ptr;
+
   try
   {
     auto_ptr<database> db (create_database (argc, argv));
diff --git a/relationship/driver.cxx b/relationship/driver.cxx
index afd0b7f..9af06a2 100644
--- a/relationship/driver.cxx
+++ b/relationship/driver.cxx
@@ -26,7 +26,7 @@ print (const employee& e)
 
   for (projects::const_iterator i (ps.begin ()); i != ps.end (); ++i)
   {
-    shared_ptr<project> p (*i);
+    tr1::shared_ptr<project> p (*i);
     cout << "  project: " << p->name () << endl;
   }
 
@@ -36,6 +36,8 @@ print (const employee& e)
 int
 main (int argc, char* argv[])
 {
+  using tr1::shared_ptr;
+
   try
   {
     auto_ptr<database> db (create_database (argc, argv));
diff --git a/schema/custom/driver.cxx b/schema/custom/driver.cxx
index f405004..6c02f99 100644
--- a/schema/custom/driver.cxx
+++ b/schema/custom/driver.cxx
@@ -20,6 +20,8 @@ using namespace odb::core;
 int
 main (int argc, char* argv[])
 {
+  using tr1::shared_ptr;
+
   try
   {
     auto_ptr<database> db (create_database (argc, argv));
diff --git a/view/driver.cxx b/view/driver.cxx
index 8003152..9f692d1 100644
--- a/view/driver.cxx
+++ b/view/driver.cxx
@@ -19,6 +19,8 @@ using namespace odb::core;
 int
 main (int argc, char* argv[])
 {
+  using tr1::shared_ptr;
+
   try
   {
     auto_ptr<database> db (create_database (argc, argv));
-- 
cgit v1.1