Commit e7560552 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

attempt to fix clang++ compilation error

Seen on arch linux when clang++ 3.7.1 uses GCC's 6.1.1 tuple header.

* spot/twaalgos/ (ratexp_to_dfa::succ): Build the return
type explicitly.
* NEWS: Mention the issue.
parent d4c1db28
New in spot 2.0.1a (not yet released)
Nothing yet.
Bug fixes:
* Fix compilation error observed with Clang++ 3.7.1 and GCC 6.1.1
New in spot 2.0.1 (2016-05-09)
......@@ -1047,14 +1047,22 @@ namespace spot
a = translate(f);
// Using return std::make_tuple(nullptr, nullptr, nullptr) works
// with GCC 6.1.1, but breaks with clang++ 3.7.1 when using the
// same header file for <tuple>. So let's use the output type
// explicitly.
typedef std::tuple<const_twa_graph_ptr,
const ratexp_to_dfa::namer*,
const state*> res_t;
// If a is null, f has an empty language.
if (!a.first)
return std::forward_as_tuple(nullptr, nullptr, nullptr);
return res_t{nullptr, nullptr, nullptr};
auto namer = a.second;
auto st = a.first->state_from_number(namer->get_state(f));
return std::forward_as_tuple(a.first, namer, st);
return res_t{a.first, namer, st};
// The rewrite rules used here are adapted from Jean-Michel
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment