Commit d3a6c95f authored by Paul's avatar Paul
Browse files

Fix compile errors on gcc 5

parent 532a7059
...@@ -100,7 +100,7 @@ struct stream_info ...@@ -100,7 +100,7 @@ struct stream_info
part.add(ins, this->iweights[ins]); part.add(ins, this->iweights[ins]);
auto args = ins->inputs(); auto args = ins->inputs();
auto threshold_it = sort_args(args); auto threshold_it = this->sort_args(args);
if(not args.empty()) if(not args.empty())
{ {
...@@ -198,7 +198,7 @@ struct stream_info ...@@ -198,7 +198,7 @@ struct stream_info
} }
else else
{ {
if(not f(get_stream(i))) if(not f(this->get_stream(i)))
return false; return false;
} }
} }
...@@ -243,7 +243,7 @@ struct stream_info ...@@ -243,7 +243,7 @@ struct stream_info
self(i); self(i);
continue; continue;
} }
auto stream = get_stream(i); auto stream = this->get_stream(i);
if(not contains(m, stream)) if(not contains(m, stream))
m[stream] = i; m[stream] = i;
else else
...@@ -273,7 +273,7 @@ struct stream_info ...@@ -273,7 +273,7 @@ struct stream_info
merge_from[ins].insert(merge_from[arg].begin(), merge_from[arg].end()); merge_from[ins].insert(merge_from[arg].begin(), merge_from[arg].end());
} }
auto streams = get_streams(ins); auto streams = this->get_streams(ins);
// Collect concur instructions for each merge point. // Collect concur instructions for each merge point.
for(auto& merge : merge_from[ins]) for(auto& merge : merge_from[ins])
......
Markdown is supported
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