97 lines
3.3 KiB
Diff
97 lines
3.3 KiB
Diff
diff -c -r soci-3.2.3.orig/src/backends/firebird/statement.cpp soci-3.2.3/src/backends/firebird/statement.cpp
|
|
*** soci-3.2.3.orig/src/backends/firebird/statement.cpp 2015-04-08 19:39:00.000000000 -0300
|
|
--- soci-3.2.3/src/backends/firebird/statement.cpp 2016-07-15 05:34:54.025411700 -0300
|
|
***************
|
|
*** 53,65 ****
|
|
|
|
ISC_STATUS stat[stat_size];
|
|
|
|
! if (stmtp_ != NULL)
|
|
{
|
|
if (isc_dsql_free_statement(stat, &stmtp_, DSQL_drop))
|
|
{
|
|
throw_iscerror(stat);
|
|
}
|
|
! stmtp_ = NULL;
|
|
}
|
|
|
|
if (sqldap_ != NULL)
|
|
--- 53,65 ----
|
|
|
|
ISC_STATUS stat[stat_size];
|
|
|
|
! if (stmtp_ != (isc_stmt_handle)NULL)
|
|
{
|
|
if (isc_dsql_free_statement(stat, &stmtp_, DSQL_drop))
|
|
{
|
|
throw_iscerror(stat);
|
|
}
|
|
! stmtp_ = (isc_stmt_handle)NULL;
|
|
}
|
|
|
|
if (sqldap_ != NULL)
|
|
diff -c -r soci-3.2.3.orig/src/backends/sqlite3/soci-sqlite3.h soci-3.2.3/src/backends/sqlite3/soci-sqlite3.h
|
|
*** soci-3.2.3.orig/src/backends/sqlite3/soci-sqlite3.h 2015-04-08 19:39:00.000000000 -0300
|
|
--- soci-3.2.3/src/backends/sqlite3/soci-sqlite3.h 2016-07-15 05:32:02.348241800 -0300
|
|
***************
|
|
*** 61,67 ****
|
|
public:
|
|
sqlite3_soci_error(std::string const & msg, int result);
|
|
|
|
! int result() const;
|
|
|
|
private:
|
|
int result_;
|
|
--- 61,67 ----
|
|
public:
|
|
sqlite3_soci_error(std::string const & msg, int result);
|
|
|
|
! SOCI_SQLITE3_DECL int result() const;
|
|
|
|
private:
|
|
int result_;
|
|
diff -c -r soci-3.2.3.orig/src/cmake/SociConfig.cmake soci-3.2.3/src/cmake/SociConfig.cmake
|
|
*** soci-3.2.3.orig/src/cmake/SociConfig.cmake 2015-04-08 19:39:00.000000000 -0300
|
|
--- soci-3.2.3/src/cmake/SociConfig.cmake 2016-07-15 05:32:02.348241800 -0300
|
|
***************
|
|
*** 32,39 ****
|
|
"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
!
|
|
! set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
|
|
--- 32,41 ----
|
|
"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
!
|
|
! if(NOT MINGW)
|
|
! set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
|
|
! endif()
|
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
|
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
|
|
diff -c -r soci-3.2.3.orig/src/CMakeLists.txt soci-3.2.3/src/CMakeLists.txt
|
|
*** soci-3.2.3.orig/src/CMakeLists.txt 2015-04-08 19:39:00.000000000 -0300
|
|
--- soci-3.2.3/src/CMakeLists.txt 2016-07-15 05:32:02.363867500 -0300
|
|
***************
|
|
*** 73,79 ****
|
|
# Installation
|
|
###############################################################################
|
|
|
|
! if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
set(SOCI_LIBDIR "lib")
|
|
else()
|
|
set(SOCI_LIBDIR "lib64")
|
|
--- 73,79 ----
|
|
# Installation
|
|
###############################################################################
|
|
|
|
! if(APPLE OR MINGW OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
set(SOCI_LIBDIR "lib")
|
|
else()
|
|
set(SOCI_LIBDIR "lib64")
|