Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the C++11 changes back in. Replaces #327 #336

Merged
merged 1 commit into from
May 19, 2015
Merged

Added the C++11 changes back in. Replaces #327 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmake/SociBackend.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@ macro(soci_backend NAME)
${THIS_BACKEND_SOURCES}
${THIS_BACKEND_HEADERS})

# Still need to link the libraries for tests to work
target_link_libraries (${THIS_BACKEND_TARGET_STATIC}
${THIS_BACKEND_DEPENDS_LIBRARIES}
)

set_target_properties(${THIS_BACKEND_TARGET_STATIC}
PROPERTIES
OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME}
Expand Down
23 changes: 19 additions & 4 deletions cmake/SociConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ else(WIN32)
check_cxx_symbol_exists("__arm__" "" SOCI_TARGET_ARCH_ARM)
endif(WIN32)

#
# C++11 Option
#

set (SOCI_CXX_C11 OFF CACHE BOOL "Build to the C++11 standard")


#
# Force compilation flags and set desired warnings level
#
Expand All @@ -44,16 +51,24 @@ if (MSVC)
else()

set(SOCI_GCC_CLANG_COMMON_FLAGS
"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
"-pedantic -Werror -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")


if (SOCI_CXX_C11)
set(SOCI_CXX_VERSION_FLAGS "-std=c++11")
add_definitions(-DSOCI_CXX_C11)
else()
set(SOCI_CXX_VERSION_FLAGS "-ansi -std=gnu++98")
endif()

if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS} ${SOCI_CXX_VERSION_FLAGS} ")
if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wno-variadic-macros")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros")
endif()
endif()

Expand Down
10 changes: 10 additions & 0 deletions include/soci/boost-optional.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
namespace soci
{

// tmp is uninitialized
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif

// simple fall-back for boost::optional
template <typename T>
struct type_conversion<boost::optional<T> >
Expand Down Expand Up @@ -52,4 +58,8 @@ struct type_conversion<boost::optional<T> >

} // namespace soci

#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif

#endif // SOCI_BOOST_OPTIONAL_H_INCLUDED
6 changes: 6 additions & 0 deletions include/soci/rowset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,14 @@ class rowset_impl

unsigned int refs_;

#ifdef SOCI_CXX_C11
const std::unique_ptr<statement> st_;
const std::unique_ptr<T> define_;
#else
const std::auto_ptr<statement> st_;
const std::auto_ptr<T> define_;
#endif


// Non-copyable
rowset_impl(rowset_impl const &);
Expand Down
15 changes: 13 additions & 2 deletions include/soci/session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ class SOCI_DECL session
{
private:

#ifdef SOCI_CXX_C11
void set_query_transformation_(std::unique_ptr<details::query_transformation_function> & qtf);
#else
void set_query_transformation_(std::auto_ptr<details::query_transformation_function> qtf);
#endif



public:
session();
Expand Down Expand Up @@ -77,9 +83,14 @@ class SOCI_DECL session
template <typename T>
void set_query_transformation(T callback)
{

#ifdef CXX_C11
std::unique_ptr<details::query_transformation_function> qtf(new details::query_transformation<T>(callback));
#else
std::auto_ptr<details::query_transformation_function> qtf(new details::query_transformation<T>(callback));
set_query_transformation_(qtf);
}
#endif

}

// support for basic logging
void set_log_stream(std::ostream * s);
Expand Down
22 changes: 22 additions & 0 deletions src/backends/mysql/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,18 @@ void parse_connect_string(const string & connectString,

} // namespace anonymous


#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wuninitialized"
#endif

#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif


mysql_session_backend::mysql_session_backend(
connection_parameters const & parameters)
{
Expand Down Expand Up @@ -333,6 +345,16 @@ mysql_session_backend::mysql_session_backend(
}
}

#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif

#ifdef __clang__
#pragma clang diagnostic pop
#endif



mysql_session_backend::~mysql_session_backend()
{
clean_up();
Expand Down
7 changes: 7 additions & 0 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ if (SOCI_STATIC)

add_library(${SOCI_CORE_TARGET_STATIC} STATIC
${SOCI_CORE_HEADERS} ${SOCI_CORE_SOURCES})

# we still need to link against dl if we have it
target_link_libraries (${SOCI_CORE_TARGET_STATIC}
${SOCI_CORE_DEPS_LIBS}
)



set_target_properties(${SOCI_CORE_TARGET_STATIC}
PROPERTIES
Expand Down
10 changes: 8 additions & 2 deletions src/core/session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,14 @@ std::string session::get_query() const
}
}

void session::set_query_transformation_(
std::auto_ptr<details::query_transformation_function> qtf)

#ifdef SOCI_CXX_C11
void session::set_query_transformation_( std::unique_ptr<details::query_transformation_function> &qtf)
#else
void session::set_query_transformation_( std::auto_ptr<details::query_transformation_function> qtf)
#endif


{
if (isFromPool_)
{
Expand Down
11 changes: 11 additions & 0 deletions tests/db2/test-db2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ using namespace soci::tests;
std::string connectString;
backend_factory const &backEnd = *soci::factory_db2();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not inline operator in common-tests.h?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was thinking that as I pasted them again. Should probably do that. It's neater. Cheers

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, it's just that kind of thing that raises questions :)
As I said, feel free to improve things with following PRs.
(I do really need to take care of Travis CI for C11 mode, so you have safety net too.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is Clang being a real pain for Oracle then? Presumably we'll see this in the OS X tests as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still unclear myself, so will have to look again before I know what's the problem :)

std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif


//
// Support for soci Common Tests
Expand Down
13 changes: 13 additions & 0 deletions tests/empty/test-empty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ using namespace soci;
std::string connectString;
backend_factory const &backEnd = *soci::factory_empty();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
#include <boost/optional.hpp>

namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif


// NOTE:
// This file is supposed to serve two purposes:
Expand Down
11 changes: 11 additions & 0 deletions tests/firebird/test-firebird.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ using namespace soci;
std::string connectString;
soci::backend_factory const &backEnd = *factory_firebird();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

// fundamental tests - transactions in Firebird
TEST_CASE("Firebird transactions", "[firebird][transaction]")
{
Expand Down
11 changes: 11 additions & 0 deletions tests/mysql/test-mysql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@
std::string connectString;
backend_factory const &backEnd = *soci::factory_mysql();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif


// procedure call test
TEST_CASE("MySQL stored procedures", "[mysql][stored-procedure]")
Expand Down
11 changes: 11 additions & 0 deletions tests/odbc/test-odbc-access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@
using namespace soci;
using namespace soci::tests;

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

std::string connectString;
backend_factory const &backEnd = *soci::factory_odbc();

Expand Down
12 changes: 12 additions & 0 deletions tests/odbc/test-odbc-db2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
using namespace soci;
using namespace soci::tests;


// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

std::string connectString;
backend_factory const &backEnd = *soci::factory_odbc();

Expand Down
12 changes: 12 additions & 0 deletions tests/odbc/test-odbc-mssql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ using namespace soci::tests;
std::string connectString;
backend_factory const &backEnd = *soci::factory_odbc();


// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

// DDL Creation objects for common tests
struct table_creator_one : public table_creator_base
{
Expand Down
12 changes: 12 additions & 0 deletions tests/odbc/test-odbc-mysql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
std::string connectString;
backend_factory const &backEnd = *soci::factory_odbc();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif


int main(int argc, char** argv)
{
#ifdef _MSC_VER
Expand Down
12 changes: 12 additions & 0 deletions tests/odbc/test-odbc-postgresql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@
using namespace soci;
using namespace soci::tests;


// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

// A generic version class: we might want to factor it out later if it is
// needed elsewhere (it would probably also need to be renamed to something
// less generic then).
Expand Down
12 changes: 12 additions & 0 deletions tests/oracle/test-oracle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ using namespace soci::tests;
std::string connectString;
backend_factory const &backEnd = *soci::factory_oracle();

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif


// Extra tests for date/time
TEST_CASE("Oracle datetime", "[oracle][datetime]")
{
Expand Down
11 changes: 11 additions & 0 deletions tests/postgresql/test-postgresql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
using namespace soci;
using namespace soci::tests;

// It appears later versions of GCC arent happy with this - to be fixed properly

#if (__GNUC__ == 4 && (__GNUC_MINOR__ > 6)) || (__clang__ == 1)
namespace boost {
std::basic_ostream<char, std::char_traits<char> >& operator<< (std::basic_ostream<char, std::char_traits<char> > & stream, boost::optional<int> const & value){
std::ostringstream oss;
return oss << "Currently not supported.";
}
}
#endif

std::string connectString;
backend_factory const &backEnd = *soci::factory_postgresql();

Expand Down
Loading