3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00
Code Issues Projects Releases Wiki Activity

Fix cygwin-gcc and cmake problems

Browse Source 
Fixed warning in CMake
Fixed problem with tuples creation
Fixed problem of stream copy constructor usage
This commit is contained in:
Johan 2014-08-20 21:58:57 +02:00
parent d856709cf3
commit 73973f0f48
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -23,6 +23,10 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmake_minimum_required(VERSION 2.6) 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) project (sqlpp11)
enable_testing() enable_testing()

2
include/sqlpp11/insert_value_list.h
View File

@ -105,7 +105,7 @@ namespace sqlpp
insert_list_data_t(Assignments... assignments): insert_list_data_t(Assignments... assignments):
_assignments(assignments...), _assignments(assignments...),
_columns({assignments._lhs}...), _columns({assignments._lhs}...),
_values({assignments._rhs}...) _values(assignments._rhs...)
{} {}
insert_list_data_t(const insert_list_data_t&) = default; insert_list_data_t(const insert_list_data_t&) = default;

2
test_constraints/CMakeLists.txt
View File

@ -22,7 +22,7 @@ function(test_constraint name pattern)
add_dependencies(test_sqlpp_constraints test_${name}) 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") test_constraint(no_conversion_operator_if_null_not_trivial "int i = row.alpha")

6
tests/MockDb.h
View File

@ -41,6 +41,12 @@ struct MockDbT: public sqlpp::connection
{ {
std::ostringstream _os; std::ostringstream _os;
_serializer_context_t() = default;
_serializer_context_t(const _serializer_context_t& rhs)
{
_os << rhs._os.str();
}
std::string str() const std::string str() const
{ {
return _os.str(); return _os.str();