diff --git a/include/sqlpp11/detail/sum.h b/include/sqlpp11/detail/sum.h deleted file mode 100644 index 8a0b762b..00000000 --- a/include/sqlpp11/detail/sum.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2013-2015, Roland Bock - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SQLPP11_DETAIL_SUM_H -#define SQLPP11_DETAIL_SUM_H - -namespace sqlpp -{ - namespace detail - { - /** a non-recursive C++14 version - template - constexpr std::size_t sum(Args... args) - { - std::size_t result = 0; - - using swallow = int[]; - (void) swallow{(result += args, 0)...}; - - return result; - } - */ - - constexpr std::size_t sum() - { - return 0; - } - - template - constexpr std::size_t sum(Arg arg, Rest... rest) - { - return arg + sum(rest...); - } - } // namespace detail -} // namespace sqlpp - -#endif diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h index 8f3e950e..93e5257f 100644 --- a/include/sqlpp11/from.h +++ b/include/sqlpp11/from.h @@ -27,7 +27,6 @@ #ifndef SQLPP11_FROM_H #define SQLPP11_FROM_H -#include #include #include #include