From 2240c904c16aa0c5cdb261c17070d971f06a8c01 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 May 2018 13:59:35 +0200
Subject: Omit TR1 support from C++11 and up

---
 odb/header.cxx | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'odb/header.cxx')

diff --git a/odb/header.cxx b/odb/header.cxx
index 6654a42..48c55de 100644
--- a/odb/header.cxx
+++ b/odb/header.cxx
@@ -778,22 +778,25 @@ namespace header
        << "#include <odb/wrapper-traits.hxx>" << endl
        << "#include <odb/pointer-traits.hxx>" << endl;
 
-    // In case of a boost TR1 implementation, we cannot distinguish
-    // between the boost::shared_ptr and std::tr1::shared_ptr usage since
-    // the latter is just a using-declaration for the former. To resolve
-    // this we will include TR1 traits if the Boost TR1 header is included.
-    //
-    if (ctx.features.tr1_pointer)
-    {
-      os << "#include <odb/tr1/wrapper-traits.hxx>" << endl
-         << "#include <odb/tr1/pointer-traits.hxx>" << endl;
-    }
-    else if (ctx.features.boost_pointer)
+    if (ctx.options.std () == cxx_version::cxx98)
     {
-      os << "#ifdef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
-         << "#  include <odb/tr1/wrapper-traits.hxx>" << endl
-         << "#  include <odb/tr1/pointer-traits.hxx>" << endl
-         << "#endif" << endl;
+      // In case of a boost TR1 implementation, we cannot distinguish
+      // between the boost::shared_ptr and std::tr1::shared_ptr usage since
+      // the latter is just a using-declaration for the former. To resolve
+      // this we will include TR1 traits if the Boost TR1 header is included.
+      //
+      if (ctx.features.tr1_pointer)
+      {
+        os << "#include <odb/tr1/wrapper-traits.hxx>" << endl
+           << "#include <odb/tr1/pointer-traits.hxx>" << endl;
+      }
+      else if (ctx.features.boost_pointer)
+      {
+        os << "#ifdef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
+           << "#  include <odb/tr1/wrapper-traits.hxx>" << endl
+           << "#  include <odb/tr1/pointer-traits.hxx>" << endl
+           << "#endif" << endl;
+      }
     }
 
     os << "#include <odb/container-traits.hxx>" << endl;
-- 
cgit v1.1