From 8470e4be41246ea85df34ac660e4e94e010a52a2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 18 Jan 2014 08:45:42 +0200 Subject: Update C++11 feature macros for VC++12 (2013) --- odb/details/config-vc.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/odb/details/config-vc.h b/odb/details/config-vc.h index ab7164e..124255b 100644 --- a/odb/details/config-vc.h +++ b/odb/details/config-vc.h @@ -16,16 +16,15 @@ #if _MSC_VER >= 1600 # define ODB_CXX11 # define ODB_CXX11_NULLPTR -//# define ODB_CXX11_DELETED_FUNCTION -//# define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR -//# define ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT -//# define ODB_CXX11_VARIADIC_TEMPLATES -//# define ODB_CXX11_INITIALIZER_LIST - -// Strongly typed enums are supported starting from VC++11. -// # if _MSC_VER >= 1700 # define ODB_CXX11_ENUM +# if _MSC_VER >= 1800 +# define ODB_CXX11_DELETED_FUNCTION +# define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR +# define ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT +# define ODB_CXX11_VARIADIC_TEMPLATES +# define ODB_CXX11_INITIALIZER_LIST +# endif # endif #endif -- cgit v1.1