mirror/sqlpp11
1
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2026-05-07 20:00:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compile time checks for concat

Browse Source
This commit is contained in:
Roland Bock
2013-09-19 08:15:19 +02:00
parent 683731517a
commit 1ab504f908
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sqlpp11/concat.h
+4 -3
View File
@@ -29,6 +29,7 @@
#include <sstream>
#include <sqlpp11/text.h>
#include <sqlpp11/detail/set.h>
namespace sqlpp
{
@@ -37,10 +38,10 @@ namespace sqlpp
struct text;
template<typename Text, typename... Args>
struct concat_t: public Text::template operators<concat_t<Args...>>
struct concat_t: public Text::template operators<concat_t<Text, Args...>>
{
using _valid_args = typename detail::make_set_if<is_text_t, Args...>::type;
static_assert(_valid_args::size::value == sizeof...(Args), "at least one non-text argument detected in concat()");
using _valid_args = typename detail::make_set_if_not<is_text_t, Args...>::type;
static_assert(_valid_args::size::value == 0, "at least one non-text argument detected in concat()");
using _value_type = Text;
struct _name_t
include/sqlpp11/text.h
+1 -8
View File
@@ -107,18 +107,11 @@ namespace sqlpp
template<typename T>
using _constraint = operand_t<T, is_text_t>;
struct plus_
{
using _value_type = boolean;
static constexpr const char* _name = "+";
};
template<typename Base>
struct operators: public basic_operators<Base, _constraint>
{
template<typename T>
detail::concat_t<Base, Base, typename _constraint<T>::type> operator+(T&& t) const
detail::concat_t<text, Base, typename _constraint<T>::type> operator+(T&& t) const
{
return { *static_cast<const Base*>(this), std::forward<T>(t) };
}