Get rid of ODB_BUILD2 macro in ODB compiler

5 files changed, 9 insertions, 24 deletions

diff --git a/odb/odb/buildfile b/odb/odb/buildfile
index ccfb49b..96eb95f 100644
--- a/odb/odb/buildfile
+++ b/odb/odb/buildfile
@@ -98,7 +98,6 @@ hxx{version}:
 #
 cxx.poptions += "-I$plugin_dir/include"
 cxx.poptions += "-DODB_GXX_NAME=\"$regex.replace($gxx_name, '\\', '\\\\')\""
-cxx.poptions += -DODB_BUILD2 # @@ TMP while supporting other build systems.
 
 ## Consumption build ($develop == false).
 #
diff --git a/odb/odb/generator.cxx b/odb/odb/generator.cxx
index dfdd3bf..6348234 100644
--- a/odb/odb/generator.cxx
+++ b/odb/odb/generator.cxx
@@ -15,13 +15,8 @@
 #include <libcutl/compiler/cxx-indenter.hxx>
 #include <libcutl/compiler/sloc-counter.hxx>
 
-#ifdef ODB_BUILD2
 #include <libstudxml/parser.hxx>
 #include <libstudxml/serializer.hxx>
-#else
-#include <libcutl/xml/parser.hxx>
-#include <libcutl/xml/serializer.hxx>
-#endif
 
 #include <odb/version.hxx>
 #include <odb/context.hxx>
diff --git a/odb/odb/header.cxx b/odb/odb/header.cxx
index fad28b3..dacdd1d 100644
--- a/odb/odb/header.cxx
+++ b/odb/odb/header.cxx
@@ -777,7 +777,9 @@ namespace header
        << "#include <odb/wrapper-traits.hxx>" << endl
        << "#include <odb/pointer-traits.hxx>" << endl;
 
-#ifndef ODB_BUILD2
+    // @@ TMP: drop after 2.5.0.
+    //
+#if 0
     if (ctx.options.std () == cxx_version::cxx98)
     {
       // In case of a boost TR1 implementation, we cannot distinguish
diff --git a/odb/odb/odb.cxx b/odb/odb/odb.cxx
index fd32678..2b7022c 100644
--- a/odb/odb/odb.cxx
+++ b/odb/odb/odb.cxx
@@ -539,7 +539,6 @@ main (int argc, char* argv[])
       if (plugin.empty ())
         return 1; // Diagnostics has already been issued.
 
-#ifdef ODB_BUILD2
 #ifdef _WIN32
       // Here is the problem: since the plugin is loaded by GCC (cc1plus.exe
       // to be precise), the DLL assembly magic we have for executables won't
@@ -575,7 +574,6 @@ main (int argc, char* argv[])
         _putenv (v.c_str ());
       }
 #endif
-#endif
 
       args[7] = "-fplugin=" + plugin.string ();
     }
@@ -636,13 +634,9 @@ main (int argc, char* argv[])
         ostream& o (cout);
 
         o << "ODB object-relational mapping (ORM) compiler for C++ "
-          ODB_COMPILER_VERSION_STR << endl;
-
-#ifdef ODB_BUILD2
-        o << "Copyright (c) " << ODB_COPYRIGHT << "." << endl;
-#endif
-
-        o << "This is free software; see the source for copying conditions. "
+          ODB_COMPILER_VERSION_STR << endl
+          << "Copyright (c) " << ODB_COPYRIGHT << "." << endl
+          << "This is free software; see the source for copying conditions. "
           << "There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS "
           << "FOR A PARTICULAR PURPOSE." << endl;
 
@@ -1170,7 +1164,8 @@ main (int argc, char* argv[])
 
             // TR1 wrapper/pointer traits.
             //
-#ifndef ODB_BUILD2
+            // @@ TMP: drop after 2.5.0.
+#if 0
             if (ops.std () == cxx_version::cxx98)
               os << endl
                  << "#ifndef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
@@ -1615,7 +1610,7 @@ plugin_path (path const& drv,
 // bug in the extension stripping code. So for now we use the .so extension
 // everywhere (see also buildfile if changing this).
 //
-//#elif defined(__APPLE__) && defined(ODB_BUILD2)
+//#elif defined(__APPLE__)
 //  char const plugin_ext[] = ".dylib";
 #else
   char const plugin_ext[] = ".so";
diff --git a/odb/odb/semantics/relational/elements.hxx b/odb/odb/semantics/relational/elements.hxx
index 06ec552..4036942 100644
--- a/odb/odb/semantics/relational/elements.hxx
+++ b/odb/odb/semantics/relational/elements.hxx
@@ -14,14 +14,8 @@
 #include <libcutl/container/pointer-iterator.hxx>
 #include <libcutl/compiler/context.hxx>
 
-#ifdef ODB_BUILD2
 #include <libstudxml/parser.hxx>
 #include <libstudxml/serializer.hxx>
-#else
-#include <libcutl/xml/parser.hxx>
-#include <libcutl/xml/serializer.hxx>
-namespace cutl {namespace xml {typedef parser content;}}
-#endif
 
 #include <odb/semantics/relational/name.hxx>