aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-08-18 18:27:00 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-08-18 18:27:00 +0200
commita5e7a049052324e34cb7d163333f6e449065c5af (patch)
tree2e8fd57c5abf11cb906d6b0c2cc47e351a31c928
parentb41056d73ee0c2ba29649932625d620434350a9f (diff)
Move buffer to the details namespace
-rw-r--r--common/query/traits.hxx2
-rw-r--r--mysql/types/driver.cxx6
-rw-r--r--mysql/types/traits.hxx18
3 files changed, 13 insertions, 13 deletions
diff --git a/common/query/traits.hxx b/common/query/traits.hxx
index 39d2ca4..dbef5ac 100644
--- a/common/query/traits.hxx
+++ b/common/query/traits.hxx
@@ -33,7 +33,7 @@ namespace odb
}
static void
- set_image (odb::buffer& b,
+ set_image (details::buffer& b,
std::size_t& n,
bool& is_null,
const std::auto_ptr<std::string>& v)
diff --git a/mysql/types/driver.cxx b/mysql/types/driver.cxx
index d8b8d21..e0d6b42 100644
--- a/mysql/types/driver.cxx
+++ b/mysql/types/driver.cxx
@@ -53,11 +53,11 @@ main (int argc, char* argv[])
o.year_ = 2010;
string short_str (128, 's');
- ::buffer short_buf (short_str.c_str (), short_str.size ());
+ buffer short_buf (short_str.c_str (), short_str.size ());
string medium_str (250, 'm');
- ::buffer medium_buf (medium_str.c_str (), medium_str.size ());
+ buffer medium_buf (medium_str.c_str (), medium_str.size ());
string long_str (2040, 'l');
- ::buffer long_buf (long_str.c_str (), long_str.size ());
+ buffer long_buf (long_str.c_str (), long_str.size ());
o.char_ = short_str;
o.binary_ = short_buf;
diff --git a/mysql/types/traits.hxx b/mysql/types/traits.hxx
index 1aea637..d113e7d 100644
--- a/mysql/types/traits.hxx
+++ b/mysql/types/traits.hxx
@@ -56,14 +56,14 @@ namespace odb
};
template <>
- class value_traits< ::buffer >
+ class value_traits<buffer>
{
public:
- typedef ::buffer type;
- typedef ::buffer value_type;
+ typedef buffer type;
+ typedef buffer value_type;
static void
- set_value (type& v, const char* s, std::size_t n, bool is_null)
+ set_value (buffer& v, const char* s, std::size_t n, bool is_null)
{
if (!is_null)
v.assign (s, n);
@@ -76,7 +76,7 @@ namespace odb
std::size_t c,
std::size_t& n,
bool& is_null,
- const type& v)
+ const buffer& v)
{
is_null = false;
n = v.size ();
@@ -89,10 +89,10 @@ namespace odb
}
static void
- set_image (odb::buffer& b,
+ set_image (details::buffer& b,
std::size_t& n,
bool& is_null,
- const type& v)
+ const buffer& v)
{
is_null = false;
n = v.size ();
@@ -171,7 +171,7 @@ namespace odb
}
static void
- set_image (odb::buffer& buf,
+ set_image (details::buffer& buf,
std::size_t& n,
bool& is_null,
const set& v)
@@ -212,7 +212,7 @@ namespace odb
}
static void
- set_image (odb::buffer& b,
+ set_image (details::buffer& b,
std::size_t& n,
bool& is_null,
const std::auto_ptr<std::string>& v)