From 758b3799a8afca1bcfcc80f1863d99417a8de1eb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 5 Aug 2016 17:46:11 +0200
Subject: Initial take on build2-based build

Only C++11 is supported with GCC 4.8 and up and VC 14 and up.

This change also introduces the ODB_THREADS_CXX11 threading model. It
is the default for the build2 build but can be disabled with a global
ODB_THREADS_NONE define (global means that it should be in effect both
when building and using the library).
---
 odb/details/config.hxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'odb/details/config.hxx')

diff --git a/odb/details/config.hxx b/odb/details/config.hxx
index 36875fa..91efcea 100644
--- a/odb/details/config.hxx
+++ b/odb/details/config.hxx
@@ -65,7 +65,11 @@
 #  define ODB_THREADS_NONE
 #  define LIBODB_STATIC_LIB
 #elif defined(LIBODB_BUILD2)
-#  include <odb/details/build2/config.h>
+#  if defined(_MSC_VER)
+#    include <odb/details/build2/config-vc.h>
+#  else
+#    include <odb/details/build2/config.h>
+#  endif
 #elif defined(_MSC_VER)
 #  include <odb/details/config-vc.h>
 #else
-- 
cgit v1.1