From e9cfbae68f69b06bb4fdcd2abd7c1ee5afec0262 Mon Sep 17 00:00:00 2001 From: Justin Viiret Date: Fri, 24 Jun 2016 11:30:07 +1000 Subject: [PATCH] workaround for freebsd/clang/libc++ build issues Rather than relying on set's constructor from {}, explicitly construct the set. --- src/rose/rose_build_misc.cpp | 2 +- src/rose/rose_build_role_aliasing.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rose/rose_build_misc.cpp b/src/rose/rose_build_misc.cpp index f430f731..7fbc5f65 100644 --- a/src/rose/rose_build_misc.cpp +++ b/src/rose/rose_build_misc.cpp @@ -881,7 +881,7 @@ namespace { class OutfixAllReports : public boost::static_visitor> { public: set operator()(const boost::blank &) const { - return {}; + return set(); } template diff --git a/src/rose/rose_build_role_aliasing.cpp b/src/rose/rose_build_role_aliasing.cpp index 292e199a..b2f6b385 100644 --- a/src/rose/rose_build_role_aliasing.cpp +++ b/src/rose/rose_build_role_aliasing.cpp @@ -1234,7 +1234,8 @@ bool attemptRoseGraphMerge(RoseBuildImpl &build, bool preds_same, RoseVertex a, ReportID new_report = build.getNewNfaReport(); shared_ptr new_graph = cloneHolder(*b_h); duplicateReport(*new_graph, b_left.leftfix_report, new_report); - pruneReportIfUnused(build, new_graph, {}, b_left.leftfix_report); + pruneReportIfUnused(build, new_graph, set(), + b_left.leftfix_report); rai.rev_leftfix[a_left_id].erase(a); rai.rev_leftfix[b_left_id].erase(b);