From bf0b1014b260f04a3446a4a8ccd3817083777787 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 28 Jun 2018 11:21:32 +0200
Subject: Make build2-built ODB usable in C++98 mode

---
 odb/header.cxx |  2 ++
 odb/odb.cxx    | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/odb/header.cxx b/odb/header.cxx
index 10518a1..fdb1ea6 100644
--- a/odb/header.cxx
+++ b/odb/header.cxx
@@ -778,6 +778,7 @@ namespace header
        << "#include <odb/wrapper-traits.hxx>" << endl
        << "#include <odb/pointer-traits.hxx>" << endl;
 
+#ifndef ODB_BUILD2
     if (ctx.options.std () == cxx_version::cxx98)
     {
       // In case of a boost TR1 implementation, we cannot distinguish
@@ -798,6 +799,7 @@ namespace header
            << "#endif" << endl;
       }
     }
+#endif
 
     os << "#include <odb/container-traits.hxx>" << endl;
 
diff --git a/odb/odb.cxx b/odb/odb.cxx
index 5160985..f5dcd42 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -1057,8 +1057,6 @@ main (int argc, char* argv[])
 
           if (!ops.trace ())
           {
-            bool tr1 (ops.std () == cxx_version::cxx98);
-
             // Add the standard epilogue at the end so that we see all
             // the declarations.
             //
@@ -1071,26 +1069,29 @@ main (int argc, char* argv[])
             //
             os << "#include <memory>" << endl;
 
-            if (tr1)
-              os << "#ifndef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
-                 << "#  include <tr1/memory>" << endl
-                 << "#endif" << endl;
-
             // Standard wrapper traits.
             //
             os << "#include <odb/wrapper-traits.hxx>" << endl;
-            if (tr1)
-              os << "#include <odb/tr1/wrapper-traits.hxx>" << endl;
 
             // Standard pointer traits.
             //
             os << "#include <odb/pointer-traits.hxx>" << endl;
-            if (tr1)
-              os << "#include <odb/tr1/pointer-traits.hxx>" << endl;
 
             // Standard container traits.
             //
             os << "#include <odb/container-traits.hxx>" << endl;
+
+            // TR1 wrapper/pointer traits.
+            //
+#ifndef ODB_BUILD2
+            if (ops.std () == cxx_version::cxx98)
+              os << endl
+                 << "#ifndef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
+                 << "#  include <tr1/memory>" << endl
+                 << "#endif" << endl
+                 << "#include <odb/tr1/wrapper-traits.hxx>" << endl
+                 << "#include <odb/tr1/pointer-traits.hxx>" << endl;
+#endif
           }
         }
 
-- 
cgit v1.1