diff options
| -rw-r--r-- | libodb/odb/database.hxx | 1 | ||||
| -rw-r--r-- | odb/odb/odb.cxx | 59 |
2 files changed, 4 insertions, 56 deletions
diff --git a/libodb/odb/database.hxx b/libodb/odb/database.hxx index 51b218f..00f7cac 100644 --- a/libodb/odb/database.hxx +++ b/libodb/odb/database.hxx @@ -43,7 +43,6 @@ namespace odb // // Note: noexcept is not specified since *_map_ (std::map) can throw. // - //database (database&&) = default; // VC 2013 @@ TMP retest database (database&& d) : id_ (d.id_), tracer_ (d.tracer_), diff --git a/odb/odb/odb.cxx b/odb/odb/odb.cxx index cd8d69f..43acc43 100644 --- a/odb/odb/odb.cxx +++ b/odb/odb/odb.cxx @@ -1665,63 +1665,12 @@ plugin_path (path const& drv, path pp; #ifdef ODB_GCC_PLUGIN_DIR - // Plugin should be installed into the GCC default plugin directory. - // Ideally, in this situation, we would simply pass the plugin name and - // let GCC append the correct directory. Unfortunately, this mechanism - // was only added in GCC 4.6 so in order to support 4.5 we will have to - // emulate it ourselves. + // Plugin could be installed into the GCC default plugin directory, in which + // case we can simply pass the plugin name and let GCC append the correct + // directory. // - //@@ TMP: drop this after 2.5.0 since we no longer support GCC < 5. - // - { -#if 1 - // First get the default GCC plugin directory. - // - path d; - vector<char const*> exec_args; - exec_args.push_back (gxx.c_str ()); - exec_args.push_back ("-print-file-name=plugin"); - exec_args.push_back (0); - - process_info pi ( - start_process ( - &exec_args[0], drv.string ().c_str (), false, true)); - close (pi.out_fd); - - // Read the path from stdout. - // - { - __gnu_cxx::stdio_filebuf<char> fb (pi.in_ofd, ios_base::in); - istream is (&fb); - string line; - getline (is, line); - d = path (line); - } - - if (!wait_process (pi, drv.string ().c_str ())) - return path (); // Assume GCC issued some diagnostics. - - if (d.string () == "plugin") - { - cerr << drv << ": error: unable to obtain GCC plugin directory" << endl; - return path (); - } - - // See if the plugin is there. - // - pp = d / path (b + plugin_ext); - if (stat (pp.string ().c_str (), &info) != 0) - { - cerr << drv << ": error: no ODB plugin in GCC plugin directory '" << - d << "'" << endl; - return path (); - } + return path (b); - return pp; -#else - return path (b); -#endif - } #elif defined (ODB_PLUGIN_PATH) // If we were given a plugin path, use that. // |