diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-18 16:54:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 11:55:03 +0100 |
| commit | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (patch) | |
| tree | 090a55c7c79d2225b03aea8a9c371420c8a72921 /storage/oqgraph | |
| parent | 98ea8062075f027561488bf0f6c6e3aaf217249e (diff) | |
| download | mariadb-git-22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47.tar.gz | |
MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"
10.0 part of the fix
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/graphcore.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/oqgraph/graphcore.cc b/storage/oqgraph/graphcore.cc index 73433fc8219..4346b94805c 100644 --- a/storage/oqgraph/graphcore.cc +++ b/storage/oqgraph/graphcore.cc @@ -1036,11 +1036,11 @@ int stack_cursor::fetch_row(const row &row_info, row &result, optional<EdgeWeight> w; optional<Vertex> v; result= row_info; - if ((result.seq_indicator= seq= last.sequence())) + if ((result.seq_indicator= static_cast<bool>(seq= last.sequence()))) result.seq= *seq; - if ((result.link_indicator= v= last.vertex())) + if ((result.link_indicator= static_cast<bool>(v= last.vertex()))) result.link= get(boost::vertex_index, share->g, *v); - if ((result.weight_indicator= w= last.weight())) + if ((result.weight_indicator= static_cast<bool>(w= last.weight()))) result.weight= *w; return oqgraph::OK; } |