github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Older gcc doesn't like shadowing the function

Browse Source
This commit is contained in:
Matthew Barr 2016-07-25 16:24:30 +10:00
parent 89ddb85637
commit 151810b4fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rose/rose_build_impl.h
View File

@ -338,7 +338,7 @@ struct OutfixInfo {
template<class T> template<class T>
explicit OutfixInfo(std::unique_ptr<T> x) : proto(std::move(x)) {} explicit OutfixInfo(std::unique_ptr<T> x) : proto(std::move(x)) {}
explicit OutfixInfo(MpvProto mpv) : proto(std::move(mpv)) {} explicit OutfixInfo(MpvProto mpv_in) : proto(std::move(mpv_in)) {}
u32 get_queue(QueueIndexFactory &qif); u32 get_queue(QueueIndexFactory &qif);
@ -348,14 +348,14 @@ struct OutfixInfo {
} }
bool is_nonempty_mpv() const { bool is_nonempty_mpv() const {
auto *mpv = boost::get<MpvProto>(&proto); auto *m = boost::get<MpvProto>(&proto);
return mpv && !mpv->empty(); return m && !m->empty();
} }
bool is_dead() const { bool is_dead() const {
auto *mpv = boost::get<MpvProto>(&proto); auto *m = boost::get<MpvProto>(&proto);
if (mpv) { if (m) {
return mpv->empty(); return m->empty();
} }
return boost::get<boost::blank>(&proto) != nullptr; return boost::get<boost::blank>(&proto) != nullptr;
} }