From 297b357ea62c84d2e0925532003dfb1a54c5ff88 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 11 Feb 2013 13:20:12 +0200 Subject: Support compilers that deduce const arrays to const reference differently --- odb/mysql/query.hxx | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 (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 + static val_bind + _val (const T (&x) [N]) + { + return val_bind (x); + } + + template + static val_bind_typed + _val (const T (&x) [N]) + { + return val_bind_typed (x); + } + + template + static ref_bind + _ref (const T (&x) [N]) + { + return ref_bind (x); + } + + template + static ref_bind_typed + _ref (const T (&x) [N]) + { + return ref_bind_typed (x); + } + public: query_base& operator+= (const query_base&); -- cgit v1.1