From 73973f0f488bb81ea51f622c37cd9b83eec9146a Mon Sep 17 00:00:00 2001 From: Johan Date: Wed, 20 Aug 2014 21:58:57 +0200 Subject: [PATCH] Fix cygwin-gcc and cmake problems Fixed warning in CMake Fixed problem with tuples creation Fixed problem of stream copy constructor usage --- CMakeLists.txt | 4 ++++ include/sqlpp11/insert_value_list.h | 2 +- test_constraints/CMakeLists.txt | 2 +- tests/MockDb.h | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32fd43cc..556cdf06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmake_minimum_required(VERSION 2.6) + +# Cygwin does not define WIN32 and warn if not use with this flag +set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required + project (sqlpp11) enable_testing() diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h index 768e789b..fdf34fe5 100644 --- a/include/sqlpp11/insert_value_list.h +++ b/include/sqlpp11/insert_value_list.h @@ -105,7 +105,7 @@ namespace sqlpp insert_list_data_t(Assignments... assignments): _assignments(assignments...), _columns({assignments._lhs}...), - _values({assignments._rhs}...) + _values(assignments._rhs...) {} insert_list_data_t(const insert_list_data_t&) = default; diff --git a/test_constraints/CMakeLists.txt b/test_constraints/CMakeLists.txt index bdb60f10..4870883d 100644 --- a/test_constraints/CMakeLists.txt +++ b/test_constraints/CMakeLists.txt @@ -22,7 +22,7 @@ function(test_constraint name pattern) add_dependencies(test_sqlpp_constraints test_${name}) -endfunction(testconstraint) +endfunction(test_constraint) test_constraint(no_conversion_operator_if_null_not_trivial "int i = row.alpha") diff --git a/tests/MockDb.h b/tests/MockDb.h index d6a55365..5ef1f110 100644 --- a/tests/MockDb.h +++ b/tests/MockDb.h @@ -41,6 +41,12 @@ struct MockDbT: public sqlpp::connection { std::ostringstream _os; + _serializer_context_t() = default; + _serializer_context_t(const _serializer_context_t& rhs) + { + _os << rhs._os.str(); + } + std::string str() const { return _os.str();