From ca60bfb24c16d417be55fe8c3a499ec11e67324c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 9 Sep 2010 10:33:22 +0200
Subject: Use qualified name for shared_ptr to avoid conflicts

Qualify a few other names for consistency.
---
 common/threads/driver.cxx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'common')

diff --git a/common/threads/driver.cxx b/common/threads/driver.cxx
index dd2d9f6..72f861c 100644
--- a/common/threads/driver.cxx
+++ b/common/threads/driver.cxx
@@ -25,10 +25,6 @@
 using namespace std;
 using namespace odb;
 
-using details::shared;
-using details::shared_ptr;
-using details::thread;
-
 const size_t thread_count = 32;
 const size_t iteration_count = 100;
 
@@ -121,17 +117,17 @@ main (int argc, char* argv[])
   {
     auto_ptr<database> db (create_database (argc, argv));
 
-    vector<shared_ptr<thread> > threads;
-    vector<shared_ptr<task> > tasks;
+    vector<details::shared_ptr<details::thread> > threads;
+    vector<details::shared_ptr<task> > tasks;
 
     for (size_t i (0); i < thread_count; ++i)
     {
-      shared_ptr<task> t (new (shared) task (*db, i));
+      details::shared_ptr<task> t (new (details::shared) task (*db, i));
       tasks.push_back (t);
 
       threads.push_back (
-        shared_ptr<thread> (
-          new (shared) thread (&task::execute, t.get ())));
+        details::shared_ptr<details::thread> (
+          new (details::shared) details::thread (&task::execute, t.get ())));
     }
 
     for (size_t i (0); i < thread_count; ++i)
-- 
cgit v1.1