aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-11 13:20:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-11 13:20:12 +0200
commit297b357ea62c84d2e0925532003dfb1a54c5ff88 (patch)
tree435f67413a9dc0345336bd279b14de82a92f54bf
parent9d86ca227396461c8fc6330eaa980bae1058ad31 (diff)
Support compilers that deduce const arrays to const reference differently
-rw-r--r--odb/mysql/query.hxx35
1 files changed, 35 insertions, 0 deletions
diff --git a/odb/mysql/query.hxx b/odb/mysql/query.hxx
index 678fc77..f8f2056 100644
--- a/odb/mysql/query.hxx
+++ b/odb/mysql/query.hxx
@@ -296,6 +296,41 @@ namespace odb
return ref_bind_typed<T, ID> (x);
}
+ // Some compilers (notably VC++), when deducing const T& from const
+ // array do not strip const from the array type. As a result, in the
+ // above signatures we get, for example, T = const char[4] instead
+ // of T = char[4], which is what we want. So to "fix" such compilers,
+ // we will have to provide the following specializations of the above
+ // functions.
+ //
+ template <typename T, std::size_t N>
+ static val_bind<T[N]>
+ _val (const T (&x) [N])
+ {
+ return val_bind<T[N]> (x);
+ }
+
+ template <database_type_id ID, typename T, std::size_t N>
+ static val_bind_typed<T[N], ID>
+ _val (const T (&x) [N])
+ {
+ return val_bind_typed<T[N], ID> (x);
+ }
+
+ template <typename T, std::size_t N>
+ static ref_bind<T[N]>
+ _ref (const T (&x) [N])
+ {
+ return ref_bind<T[N]> (x);
+ }
+
+ template <database_type_id ID, typename T, std::size_t N>
+ static ref_bind_typed<T[N], ID>
+ _ref (const T (&x) [N])
+ {
+ return ref_bind_typed<T[N], ID> (x);
+ }
+
public:
query_base&
operator+= (const query_base&);