From f7adb8951f09538d879b82ba41c44f4314df4e2c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 18 Aug 2010 20:03:32 +0200
Subject: Move shared_ptr to the details namespace

---
 odb/mysql/header.cxx | 13 +++++++------
 odb/mysql/source.cxx | 12 +++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index 854d3f4..743b92e 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -104,7 +104,7 @@ namespace mysql
       virtual void
       traverse_long_string (type&, sql_type const& t)
       {
-        os << "odb::buffer " << var << "value;"
+        os << "details::buffer " << var << "value;"
            << "unsigned long " << var << "size;"
            << "my_bool " << var << "null;"
            << endl;
@@ -128,7 +128,7 @@ namespace mysql
       {
         // Represented as string.
         //
-        os << "odb::buffer " << var << "value;"
+        os << "details::buffer " << var << "value;"
            << "unsigned long " << var << "size;"
            << "my_bool " << var << "null;"
            << endl;
@@ -139,7 +139,7 @@ namespace mysql
       {
         // Represented as string.
         //
-        os << "odb::buffer " << var << "value;"
+        os << "details::buffer " << var << "value;"
            << "unsigned long " << var << "size;"
            << "my_bool " << var << "null;"
            << endl;
@@ -447,8 +447,7 @@ namespace mysql
            << endl;
 
     ctx.os << "#include <odb/core.hxx>" << endl
-           << "#include <odb/traits.hxx>" << endl
-           << "#include <odb/buffer.hxx>" << endl;
+           << "#include <odb/traits.hxx>" << endl;
 
     if (ctx.options.generate_query ())
       ctx.os << "#include <odb/result.hxx>" << endl;
@@ -460,7 +459,9 @@ namespace mysql
     if (ctx.options.generate_query ())
       ctx.os << "#include <odb/mysql/query.hxx>" << endl;
 
-    ctx.os << endl;
+    ctx.os << endl
+           << "#include <odb/details/buffer.hxx>" << endl
+           << endl;
 
     ctx.os << "namespace odb"
            << "{";
diff --git a/odb/mysql/source.cxx b/odb/mysql/source.cxx
index c8d691f..1e91344 100644
--- a/odb/mysql/source.cxx
+++ b/odb/mysql/source.cxx
@@ -990,15 +990,15 @@ namespace mysql
              << "if (imb.version == 0)" << endl
              << "bind (imb, sts.image ());"
              << endl
-             << "shared_ptr<query_statement> st (" << endl
-             << "new (shared) query_statement (conn," << endl
+             << "details::shared_ptr<query_statement> st (" << endl
+             << "new (details::shared) query_statement (conn," << endl
              << "query_clause + q.clause ()," << endl
              << "imb," << endl
              << "q.parameters ()));"
              << "st->execute ();"
              << endl
-             << "shared_ptr<odb::result_impl<object_type> > r (" << endl
-             << "new (shared) mysql::result_impl<object_type> (st, sts));"
+             << "details::shared_ptr<odb::result_impl<object_type> > r (" << endl
+             << "new (details::shared) mysql::result_impl<object_type> (st, sts));"
              << "return result<object_type> (r);"
              << "}";
         }
@@ -1043,7 +1043,9 @@ namespace mysql
            << "#include <odb/mysql/exceptions.hxx>" << endl;
 
     if (ctx.options.generate_query ())
-      ctx.os << "#include <odb/mysql/result.hxx>" << endl;
+      ctx.os << "#include <odb/mysql/result.hxx>" << endl
+             << endl
+             << "#include <odb/details/shared-ptr.hxx>" << endl;
 
     ctx.os << endl;
 
-- 
cgit v1.1