From ea413b91d756fa5fada2e18fd45b33484d78935f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 18 Jan 2014 08:34:29 +0200 Subject: Fix incorrect GCC version test (harmless until 5.0.0 is released) --- odb/details/config.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odb/details/config.hxx b/odb/details/config.hxx index b8690cc..0b80bad 100644 --- a/odb/details/config.hxx +++ b/odb/details/config.hxx @@ -14,7 +14,7 @@ # define LIBODB_STATIC_LIB # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # define ODB_CXX11 -# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 +# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 # define ODB_CXX11_NULLPTR # endif # define ODB_CXX11_DELETED_FUNCTION @@ -28,7 +28,7 @@ # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # define ODB_CXX11 # ifdef __GNUC__ -# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 +# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 # define ODB_CXX11_NULLPTR # endif # else -- cgit v1.1