From 3012187847b2783c49153db3f5486b84074cb2b0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Feb 2012 12:38:15 +0200
Subject: Build infrastructure for C++11 support

---
 odb/details/config-vc.h | 6 ++++++
 odb/details/config.h.in | 2 ++
 odb/details/config.hxx  | 3 +++
 3 files changed, 11 insertions(+)

(limited to 'odb/details')

diff --git a/odb/details/config-vc.h b/odb/details/config-vc.h
index 4ab9a7e..6b1da9e 100644
--- a/odb/details/config-vc.h
+++ b/odb/details/config-vc.h
@@ -11,4 +11,10 @@
 #define ODB_THREADS_WIN32
 #define ODB_THREADS_TLS_DECLSPEC
 
+/* VC++10 has C++11 always enabled.
+ */
+#if _MSC_VER >= 1600
+#  define ODB_CXX11
+#endif
+
 #endif /* ODB_DETAILS_CONFIG_VC_H */
diff --git a/odb/details/config.h.in b/odb/details/config.h.in
index 2422d98..5e71765 100644
--- a/odb/details/config.h.in
+++ b/odb/details/config.h.in
@@ -14,6 +14,8 @@
 #undef ODB_THREADS_TLS_KEYWORD
 #undef ODB_THREADS_TLS_DECLSPEC
 
+#undef ODB_CXX11
+
 #undef LIBODB_STATIC_LIB
 
 #endif /* ODB_DETAILS_CONFIG_H */
diff --git a/odb/details/config.hxx b/odb/details/config.hxx
index 1d7c2d9..ad0ec27 100644
--- a/odb/details/config.hxx
+++ b/odb/details/config.hxx
@@ -12,6 +12,9 @@
 #elif defined(ODB_COMPILER)
 #  define ODB_THREADS_NONE
 #  define LIBODB_STATIC_LIB
+#  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
+#    define ODB_CXX11
+#  endif
 #else
 #  include <odb/details/config.h>
 #endif
-- 
cgit v1.1