MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"

10.0 part of the fix
This commit is contained in:
Sergei Golubchik 2016-03-18 16:54:38 +01:00
parent 98ea806207
commit 22ebf3cb45
9 changed files with 50 additions and 50 deletions

View File

@ -1036,11 +1036,11 @@ int stack_cursor::fetch_row(const row &row_info, row &result,
optional<EdgeWeight> w; optional<EdgeWeight> w;
optional<Vertex> v; optional<Vertex> v;
result= row_info; result= row_info;
if ((result.seq_indicator= seq= last.sequence())) if ((result.seq_indicator= static_cast<bool>(seq= last.sequence())))
result.seq= *seq; 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); 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; result.weight= *w;
return oqgraph::OK; return oqgraph::OK;
} }