From 8aadbd2263b54172628a46a71941e75b6554c967 Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 10 Sep 2017 18:26:48 +0200 Subject: [PATCH] Reverted logic change that led to too many warnings with gcc --- include/sqlpp11/logic.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/sqlpp11/logic.h b/include/sqlpp11/logic.h index 61ef8af6..c82003ab 100644 --- a/include/sqlpp11/logic.h +++ b/include/sqlpp11/logic.h @@ -43,26 +43,26 @@ namespace sqlpp template struct all { - using type = std::is_same, logic_helper<(B, true)...>>; + using type = std::is_same, logic_helper<(B or true)...>>; }; template - using all_t = std::is_same, logic_helper<(B, true)...>>; + using all_t = std::is_same, logic_helper<(B or true)...>>; // workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629 template struct any { using type = - std::integral_constant, logic_helper<(B, false)...>>::value>; + std::integral_constant, logic_helper<(B and false)...>>::value>; }; template using any_t = - std::integral_constant, logic_helper<(B, false)...>>::value>; + std::integral_constant, logic_helper<(B and false)...>>::value>; template - using none_t = std::is_same, logic_helper<(B, false)...>>; + using none_t = std::is_same, logic_helper<(B and false)...>>; template struct not_impl;