github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-29 20:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc 4.4.7 compile errors

Browse Source
This commit is contained in:
Wilson Snyder 2018-07-16 20:38:31 -04:00
parent 78c16081a4
commit ca24357611
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/V3GraphAlg.cpp
View File

@ -122,7 +122,7 @@ private:
} }
public: public:
GraphRemoveRedundant(V3Graph* graphp, V3EdgeFuncP edgeFuncp, bool sumWeights) GraphRemoveRedundant(V3Graph* graphp, V3EdgeFuncP edgeFuncp, bool sumWeights)
: GraphAlg(graphp, edgeFuncp), m_sumWeights(sumWeights) { : GraphAlg<>(graphp, edgeFuncp), m_sumWeights(sumWeights) {
main(); main();
} }
~GraphRemoveRedundant() {} ~GraphRemoveRedundant() {}
@ -142,7 +142,7 @@ void V3Graph::removeRedundantEdgesSum(V3EdgeFuncP edgeFuncp) {
class GraphAlgRemoveTransitiveEdges : GraphAlg<> { class GraphAlgRemoveTransitiveEdges : GraphAlg<> {
public: public:
explicit GraphAlgRemoveTransitiveEdges(V3Graph* graphp) explicit GraphAlgRemoveTransitiveEdges(V3Graph* graphp)
: GraphAlg (graphp, NULL) {} : GraphAlg<>(graphp, NULL) {}
void go() { void go() {
GraphPathChecker checker(m_graphp); GraphPathChecker checker(m_graphp);
for (V3GraphVertex* vxp = m_graphp->verticesBeginp(); for (V3GraphVertex* vxp = m_graphp->verticesBeginp();
@ -210,7 +210,7 @@ private:
} }
public: public:
GraphAlgWeakly(V3Graph* graphp, V3EdgeFuncP edgeFuncp) GraphAlgWeakly(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
main(); main();
} }
~GraphAlgWeakly() {} ~GraphAlgWeakly() {}
@ -295,7 +295,7 @@ private:
} }
public: public:
GraphAlgStrongly(V3Graph* graphp, V3EdgeFuncP edgeFuncp) GraphAlgStrongly(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
m_currentDfs = 0; m_currentDfs = 0;
main(); main();
} }
@ -348,7 +348,7 @@ private:
} }
public: public:
GraphAlgRank(V3Graph* graphp, V3EdgeFuncP edgeFuncp) GraphAlgRank(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
main(); main();
} }
~GraphAlgRank() {} ~GraphAlgRank() {}
@ -406,7 +406,7 @@ private:
} }
public: public:
GraphAlgRLoops(V3Graph* graphp, V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp) GraphAlgRLoops(V3Graph* graphp, V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
m_done = false; m_done = false;
main(vertexp); main(vertexp);
} }
@ -453,7 +453,7 @@ private:
public: public:
GraphAlgSubtrees(V3Graph* graphp, V3Graph* loopGraphp, GraphAlgSubtrees(V3Graph* graphp, V3Graph* loopGraphp,
V3EdgeFuncP edgeFuncp, V3GraphVertex* vertexp) 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 // Vertex::m_userp - New vertex if we have seen this vertex already
// Edge::m_userp - New edge if we have seen this edge already // Edge::m_userp - New edge if we have seen this edge already
m_graphp->userClearVertices(); m_graphp->userClearVertices();

6
src/V3GraphDfa.cpp
View File

@ -348,7 +348,7 @@ private:
public: public:
GraphNfaToDfa(V3Graph* graphp, V3EdgeFuncP edgeFuncp) GraphNfaToDfa(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
m_step = 0; m_step = 0;
main(); main();
} }
@ -471,7 +471,7 @@ private:
} }
public: public:
DfaGraphReduce(V3Graph* graphp, V3EdgeFuncP edgeFuncp) DfaGraphReduce(V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) { : GraphAlg<>(graphp, edgeFuncp) {
if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_in"); if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_in");
optimize_accepting_out(); optimize_accepting_out();
if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_acc"); if (debug()>=6) m_graphp->dumpDotFilePrefixed("opt_acc");
@ -561,7 +561,7 @@ private:
} }
public: public:
DfaGraphComplement(V3Graph* dfagraphp, V3EdgeFuncP edgeFuncp) DfaGraphComplement(V3Graph* dfagraphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(dfagraphp, edgeFuncp) { : GraphAlg<>(dfagraphp, edgeFuncp) {
if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_in"); if (debug()>=6) m_graphp->dumpDotFilePrefixed("comp_in");
// Vertex::m_user begin: 1 indicates new edge, no more processing // Vertex::m_user begin: 1 indicates new edge, no more processing

2
src/V3GraphPathChecker.cpp
View File

@ -55,7 +55,7 @@ struct GraphPCNode {
// GraphPathChecker implementation // GraphPathChecker implementation
GraphPathChecker::GraphPathChecker(const V3Graph* graphp, V3EdgeFuncP edgeFuncp) GraphPathChecker::GraphPathChecker(const V3Graph* graphp, V3EdgeFuncP edgeFuncp)
: GraphAlg(graphp, edgeFuncp) : GraphAlg<const V3Graph>(graphp, edgeFuncp)
, m_generation(0) { , m_generation(0) {
for (V3GraphVertex* vxp = graphp->verticesBeginp(); for (V3GraphVertex* vxp = graphp->verticesBeginp();
vxp; vxp = vxp->verticesNextp()) { vxp; vxp = vxp->verticesNextp()) {