aboutsummaryrefslogtreecommitdiff
path: root/odb/details/config-vc.h
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-03-02 12:34:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-03-02 12:34:54 +0200
commit8a9e1081c026a092c7dfb28fbd079b88850c7233 (patch)
treef44ba71ea18365b8d9c1a97c09b624a0c4d150dc /odb/details/config-vc.h
parent0f25b194dcbcfa95a80284069999dd92341ce36d (diff)
Portability workarounds for incomplete C++11 support in VC++ and old GCC
Diffstat (limited to 'odb/details/config-vc.h')
-rw-r--r--odb/details/config-vc.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/odb/details/config-vc.h b/odb/details/config-vc.h
index 6b1da9e..56d69e7 100644
--- a/odb/details/config-vc.h
+++ b/odb/details/config-vc.h
@@ -11,10 +11,16 @@
#define ODB_THREADS_WIN32
#define ODB_THREADS_TLS_DECLSPEC
-/* VC++10 has C++11 always enabled.
+/* VC++10 and later have C++11 always enabled.
*/
#if _MSC_VER >= 1600
# define ODB_CXX11
+# define ODB_CXX11_NULLPTR
+# if _MSC_VER >= 1800
+# define ODB_CXX11_DELETED_FUNCTION
+# define ODB_CXX11_EXPLICIT_CONVERSION_OPERATOR
+# define ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT
+# endif
#endif
#endif /* ODB_DETAILS_CONFIG_VC_H */