From 48dafdedcfa8a1532795e6eab09823e10aa8dbbf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 18 Jun 2018 15:37:24 +0200 Subject: [PATCH] COMP: fix warnings about major()/minor() name conflicts (closes #883) - major() and minor() are GNU macros in sys/sysmacros.h and generates warning on some systems (eg, Ubuntu 18.04) use getMajor() and getMinor() as method names instead. --- .../db/IOstreams/IOstreams/IOstreamOption.H | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H index f9413a25c9..f00f43249e 100644 --- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H +++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.H @@ -117,14 +117,14 @@ public: return number_; } - //- The major version number - inline int major() const noexcept + //- Return the major version number. + inline int getMajor() const noexcept { return int(number_ / 10); } - //- The minor version number - inline int minor() const noexcept + //- Return the minor version number + inline int getMinor() const noexcept { return int(number_ % 10); } @@ -132,7 +132,10 @@ public: //- A string representation of major.minor std::string str() const { - return std::to_string(major()) + '.' + std::to_string(minor()); + return + std::to_string(getMajor()) + + '.' + + std::to_string(getMinor()); }