From 8a9e1081c026a092c7dfb28fbd079b88850c7233 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 2 Mar 2012 12:34:54 +0200 Subject: Portability workarounds for incomplete C++11 support in VC++ and old GCC --- odb/details/config.hxx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'odb/details/config.hxx') diff --git a/odb/details/config.hxx b/odb/details/config.hxx index ad0ec27..fc47ec7 100644 --- a/odb/details/config.hxx +++ b/odb/details/config.hxx @@ -14,9 +14,27 @@ # define LIBODB_STATIC_LIB # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # define ODB_CXX11 +# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 +# define ODB_CXX_NULLPTR +# endif +# define ODB_CXX11_DELETED_FUNCTION +# define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR +# define ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT # endif #else # include +# ifdef ODB_CXX11 +# ifdef __GNUC__ +# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 +# define ODB_CXX_NULLPTR +# endif +# else +# define ODB_CXX_NULLPTR +# endif +# define ODB_CXX11_DELETED_FUNCTION +# define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR +# define ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT +# endif #endif // no post -- cgit v1.1