aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odb/mysql/container-statements.hxx8
-rw-r--r--odb/mysql/container-statements.txx4
-rw-r--r--odb/mysql/object-statements.hxx7
-rw-r--r--odb/mysql/object-statements.txx4
-rw-r--r--odb/mysql/result.txx2
5 files changed, 14 insertions, 11 deletions
diff --git a/odb/mysql/container-statements.hxx b/odb/mysql/container-statements.hxx
index d987838..2801210 100644
--- a/odb/mysql/container-statements.hxx
+++ b/odb/mysql/container-statements.hxx
@@ -8,6 +8,8 @@
#include <odb/pre.hxx>
+#include <cstddef> // std::size_t
+
#include <odb/forward.hxx>
#include <odb/traits.hxx>
@@ -150,9 +152,9 @@ namespace odb
}
my_bool*
- data_image_error ()
+ data_image_truncated ()
{
- return data_image_error_;
+ return data_image_truncated_;
}
//
@@ -216,7 +218,7 @@ namespace odb
std::size_t data_id_image_version_;
binding data_image_binding_;
MYSQL_BIND data_image_bind_[traits::data_column_count];
- my_bool data_image_error_[traits::data_column_count];
+ my_bool data_image_truncated_[traits::data_column_count];
details::shared_ptr<insert_statement_type> insert_one_;
details::shared_ptr<select_statement_type> select_all_;
diff --git a/odb/mysql/container-statements.txx b/odb/mysql/container-statements.txx
index 158ae43..d5e4750 100644
--- a/odb/mysql/container-statements.txx
+++ b/odb/mysql/container-statements.txx
@@ -35,10 +35,10 @@ namespace odb
std::memset (cond_image_bind_, 0, sizeof (cond_image_bind_));
std::memset (data_image_bind_, 0, sizeof (data_image_bind_));
- std::memset (data_image_error_, 0, sizeof (data_image_error_));
+ std::memset (data_image_truncated_, 0, sizeof (data_image_truncated_));
for (std::size_t i (0); i < traits::data_column_count; ++i)
- data_image_bind_[i].error = data_image_error_ + i;
+ data_image_bind_[i].error = data_image_truncated_ + i;
}
}
}
diff --git a/odb/mysql/object-statements.hxx b/odb/mysql/object-statements.hxx
index 4e6b2fb..e5f6489 100644
--- a/odb/mysql/object-statements.hxx
+++ b/odb/mysql/object-statements.hxx
@@ -10,6 +10,7 @@
#include <vector>
#include <cassert>
+#include <cstddef> // std::size_t
#include <odb/forward.hxx>
#include <odb/traits.hxx>
@@ -210,9 +211,9 @@ namespace odb
}
my_bool*
- out_image_error ()
+ out_image_truncated ()
{
- return out_image_error_;
+ return out_image_truncated_;
}
// Object id image.
@@ -329,7 +330,7 @@ namespace odb
std::size_t out_image_version_;
binding out_image_binding_;
MYSQL_BIND out_image_bind_[object_traits::out_column_count];
- my_bool out_image_error_[object_traits::out_column_count];
+ my_bool out_image_truncated_[object_traits::out_column_count];
// Id image binding (only in).
//
diff --git a/odb/mysql/object-statements.txx b/odb/mysql/object-statements.txx
index d2152f7..46c8ab0 100644
--- a/odb/mysql/object-statements.txx
+++ b/odb/mysql/object-statements.txx
@@ -33,10 +33,10 @@ namespace odb
std::memset (in_image_bind_, 0, sizeof (in_image_bind_));
std::memset (out_image_bind_, 0, sizeof (out_image_bind_));
- std::memset (out_image_error_, 0, sizeof (out_image_error_));
+ std::memset (out_image_truncated_, 0, sizeof (out_image_truncated_));
for (std::size_t i (0); i < object_traits::out_column_count; ++i)
- out_image_bind_[i].error = out_image_error_ + i;
+ out_image_bind_[i].error = out_image_truncated_ + i;
}
template <typename T>
diff --git a/odb/mysql/result.txx b/odb/mysql/result.txx
index b0ffe97..8140240 100644
--- a/odb/mysql/result.txx
+++ b/odb/mysql/result.txx
@@ -114,7 +114,7 @@ namespace odb
continue;
typename object_traits::image_type& im (statements_.image ());
- object_traits::grow (im, statements_.out_image_error ());
+ object_traits::grow (im, statements_.out_image_truncated ());
if (im.version != statements_.out_image_version ())
{