From ca24357611acfe20ac31ca98428fd34c504d36f1 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 16 Jul 2018 20:38:31 -0400 Subject: [PATCH] Fix gcc 4.4.7 compile errors --- src/V3GraphAlg.cpp | 14 +++++++------- src/V3GraphDfa.cpp | 6 +++--- src/V3GraphPathChecker.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp index f31912276..015f289fc 100644 --- a/src/V3GraphAlg.cpp +++ b/src/V3GraphAlg.cpp @@ -122,7 +122,7 @@ private: } public: GraphRemoveRedundant(V3Graph* graphp, V3EdgeFuncP edgeFuncp, bool sumWeights) - : GraphAlg(graphp, edgeFuncp), m_sumWeights(sumWeights) { + : GraphAlg<>(graphp, edgeFuncp), m_sumWeights(sumWeights) { main(); } ~GraphRemoveRedundant() {} @@ -142,7 +142,7 @@ void V3Graph::removeRedundantEdgesSum(V3EdgeFuncP edgeFuncp) { class GraphAlgRemoveTransitiveEdges : GraphAlg<> { public: explicit GraphAlgRemoveTransitiveEdges(V3Graph* graphp) - : GraphAlg (graphp, NULL) {} + : GraphAlg<>(graphp, NULL) {} void go() { GraphPathChecker checker(m_graphp); for (V3GraphVertex* vxp = m_graphp->verticesBeginp(); @@ -210,7 +210,7 @@ private: } public: GraphAlgWeakly(V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { main(); } ~GraphAlgWeakly() {} @@ -295,7 +295,7 @@ private: } public: GraphAlgStrongly(V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { m_currentDfs = 0; main(); } @@ -348,7 +348,7 @@ private: } public: GraphAlgRank(V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { main(); } ~GraphAlgRank() {} @@ -406,7 +406,7 @@ private: } public: GraphAlgRLoops(V3Graph* graphp, V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { m_done = false; main(vertexp); } @@ -453,7 +453,7 @@ private: public: GraphAlgSubtrees(V3Graph* graphp, V3Graph* loopGraphp, V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp) - : GraphAlg(graphp, edgeFuncp), m_loopGraphp (loopGraphp) { + : GraphAlg<>(graphp, edgeFuncp), m_loopGraphp (loopGraphp) { // Vertex::m_userp - New vertex if we have seen this vertex already // Edge::m_userp - New edge if we have seen this edge already m_graphp->userClearVertices(); diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp index a5797ffc1..8a964f7bd 100644 --- a/src/V3GraphDfa.cpp +++ b/src/V3GraphDfa.cpp @@ -348,7 +348,7 @@ private: public: GraphNfaToDfa(V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { m_step = 0; main(); } @@ -471,7 +471,7 @@ private: } public: DfaGraphReduce(V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) { + : GraphAlg<>(graphp, edgeFuncp) { if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_in"); optimize_accepting_out(); if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_acc"); @@ -561,7 +561,7 @@ private: } public: DfaGraphComplement(V3Graph* dfagraphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(dfagraphp, edgeFuncp) { + : GraphAlg<>(dfagraphp, edgeFuncp) { if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_in"); // Vertex::m_user begin: 1 indicates new edge, no more processing diff --git a/src/V3GraphPathChecker.cpp b/src/V3GraphPathChecker.cpp index 7156f70c4..641f8a0ba 100644 --- a/src/V3GraphPathChecker.cpp +++ b/src/V3GraphPathChecker.cpp @@ -55,7 +55,7 @@ struct GraphPCNode { // GraphPathChecker implementation GraphPathChecker::GraphPathChecker(const V3Graph* graphp, V3EdgeFuncP edgeFuncp) - : GraphAlg(graphp, edgeFuncp) + : GraphAlg(graphp, edgeFuncp) , m_generation(0) { for (V3GraphVertex* vxp = graphp->verticesBeginp(); vxp; vxp = vxp->verticesNextp()) {