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/tls.hxx | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

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

diff --git a/odb/details/tls.hxx b/odb/details/tls.hxx
index 684823a..aae148e 100644
--- a/odb/details/tls.hxx
+++ b/odb/details/tls.hxx
@@ -30,7 +30,45 @@ namespace odb
     //
     template <typename T>
     inline void
-    tls_free (T& x)
+    tls_free (T&)
+    {
+    }
+
+    template <typename T>
+    inline T*
+    tls_get (T* p)
+    {
+      return p;
+    }
+
+    template <typename T, typename T1>
+    inline void
+    tls_set (T*& rp, T1* p)
+    {
+      rp = p;
+    }
+  }
+}
+
+#elif defined(ODB_THREADS_CXX11)
+
+#  define ODB_TLS_POINTER(type) thread_local type*
+#  define ODB_TLS_OBJECT(type) thread_local type
+
+namespace odb
+{
+  namespace details
+  {
+    template <typename T>
+    inline T&
+    tls_get (T& x)
+    {
+      return x;
+    }
+
+    template <typename T>
+    inline void
+    tls_free (T&)
     {
     }
 
-- 
cgit v1.1