]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
workaround for freebsd/clang/libc++ build issues
authorJustin Viiret <justin.viiret@intel.com>
Fri, 24 Jun 2016 01:30:07 +0000 (11:30 +1000)
committerMatthew Barr <matthew.barr@intel.com>
Fri, 8 Jul 2016 01:07:51 +0000 (11:07 +1000)
Rather than relying on set's constructor from {}, explicitly construct
the set.

src/rose/rose_build_misc.cpp
src/rose/rose_build_role_aliasing.cpp

index f430f731c30481b2566502916b8a6094be7f2e00..7fbc5f65cf77d5b6a11d55b67fe92ee11b5d7a44 100644 (file)
@@ -881,7 +881,7 @@ namespace {
 class OutfixAllReports : public boost::static_visitor<set<ReportID>> {
 public:
     set<ReportID> operator()(const boost::blank &) const {
-        return {};
+        return set<ReportID>();
     }
 
     template<class T>
index 292e199a8f3eb434e73acf991bad3fae7be8fef3..b2f6b3854d182be56ea9f0c7c78474317eb2265c 100644 (file)
@@ -1234,7 +1234,8 @@ bool attemptRoseGraphMerge(RoseBuildImpl &build, bool preds_same, RoseVertex a,
         ReportID new_report = build.getNewNfaReport();
         shared_ptr<NGHolder> 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<RoseVertex>(),
+                            b_left.leftfix_report);
 
         rai.rev_leftfix[a_left_id].erase(a);
         rai.rev_leftfix[b_left_id].erase(b);