From: Matthew Fernandez Date: Sat, 12 Jun 2021 17:01:56 +0000 (-0700) Subject: remove inline no-op on C++ methods X-Git-Tag: 2.48.0~47^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=778f98496ceb20695cf14b0d8fbf87bd25c52f36;p=graphviz remove inline no-op on C++ methods Methods defined within a class definition are implied inline. Adding the inline keyword does nothing. --- diff --git a/lib/vpsc/constraint.h b/lib/vpsc/constraint.h index 8260de25e..2d35d6d20 100644 --- a/lib/vpsc/constraint.h +++ b/lib/vpsc/constraint.h @@ -31,7 +31,7 @@ public: double lm; Constraint(Variable *left, Variable *right, double gap, bool equality=false); ~Constraint(); - inline double slack() const { return right->position() - gap - left->position(); } + double slack() const { return right->position() - gap - left->position(); } long timeStamp; bool active; bool visited; diff --git a/lib/vpsc/generate-constraints.h b/lib/vpsc/generate-constraints.h index 2e9580319..0b326c4bb 100644 --- a/lib/vpsc/generate-constraints.h +++ b/lib/vpsc/generate-constraints.h @@ -54,14 +54,14 @@ public: maxY=y+height()-yBorder; minY=y; } - inline double overlapX(const Rectangle &r) const { + double overlapX(const Rectangle &r) const { if (getCentreX() <= r.getCentreX() && r.minX < getMaxX()) return getMaxX() - r.minX; if (r.getCentreX() <= getCentreX() && minX < r.getMaxX()) return r.getMaxX() - minX; return 0; } - inline double overlapY(const Rectangle &r) const { + double overlapY(const Rectangle &r) const { if (getCentreY() <= r.getCentreY() && r.minY < getMaxY()) return getMaxY() - r.minY; if (r.getCentreY() <= getCentreY() && minY < r.getMaxY()) diff --git a/lib/vpsc/variable.h b/lib/vpsc/variable.h index 9002043e5..bf79de4a9 100644 --- a/lib/vpsc/variable.h +++ b/lib/vpsc/variable.h @@ -35,7 +35,7 @@ public: Constraints in; Constraints out; char *toString(); - inline Variable(const int id, const double desiredPos, const double weight) + Variable(const int id, const double desiredPos, const double weight) : id(id) , desiredPosition(desiredPos) , weight(weight) @@ -43,7 +43,7 @@ public: , visited(false) { } - inline double position() const { + double position() const { return block->posn+offset; } };