From 542ef166285bfcf26d46eb240884b94661d90d48 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 2 Apr 2019 15:36:16 +0200
Subject: [PATCH] STYLE: make some OSspecific constructors explicit
---
src/OSspecific/POSIX/Make/files | 10 +++++-----
src/OSspecific/POSIX/POSIX.H | 4 ++--
src/OSspecific/POSIX/fileMonitor.H | 2 +-
src/OSspecific/POSIX/fileStat.H | 2 +-
src/OSspecific/POSIX/timer.H | 5 ++---
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/OSspecific/POSIX/Make/files b/src/OSspecific/POSIX/Make/files
index 26e735cb883..06df47630ff 100644
--- a/src/OSspecific/POSIX/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@@ -1,3 +1,8 @@
+clockTime/clockTime.C
+clockValue/clockValue.C
+cpuInfo/cpuInfo.C
+cpuTime/cpuTime.C
+memInfo/memInfo.C
signals/sigFpe.C
signals/sigSegv.C
signals/sigInt.C
@@ -8,11 +13,6 @@ regExpPosix.C
timer.C
fileStat.C
POSIX.C
-cpuTime/cpuTime.C
-clockTime/clockTime.C
-clockValue/clockValue.C
-cpuInfo/cpuInfo.C
-memInfo/memInfo.C
/*
* Note: fileMonitor assumes inotify by default. Compile with -DFOAM_USE_STAT
diff --git a/src/OSspecific/POSIX/POSIX.H b/src/OSspecific/POSIX/POSIX.H
index 7eedfb5e5cb..c5a8818baa7 100644
--- a/src/OSspecific/POSIX/POSIX.H
+++ b/src/OSspecific/POSIX/POSIX.H
@@ -51,8 +51,8 @@ namespace POSIX
//- Declare namespace and its debug switch
NamespaceName("POSIX");
- const label pathLengthChunk = 256;
- const label pathLengthMax = 4096;
+ constexpr label pathLengthChunk = 256;
+ constexpr label pathLengthMax = 4096;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H
index 181587a3028..302930f86e1 100644
--- a/src/OSspecific/POSIX/fileMonitor.H
+++ b/src/OSspecific/POSIX/fileMonitor.H
@@ -120,7 +120,7 @@ public:
// Constructors
//- Construct null
- fileMonitor(const bool useInotify);
+ explicit fileMonitor(const bool useInotify);
//- Destructor
diff --git a/src/OSspecific/POSIX/fileStat.H b/src/OSspecific/POSIX/fileStat.H
index 2c2d02f3682..13b17f3d0f5 100644
--- a/src/OSspecific/POSIX/fileStat.H
+++ b/src/OSspecific/POSIX/fileStat.H
@@ -111,7 +111,7 @@ public:
);
//- Construct from Istream
- fileStat(Istream& is);
+ explicit fileStat(Istream& is);
// Member Functions
diff --git a/src/OSspecific/POSIX/timer.H b/src/OSspecific/POSIX/timer.H
index 2f9df530b5c..c4ddc7accae 100644
--- a/src/OSspecific/POSIX/timer.H
+++ b/src/OSspecific/POSIX/timer.H
@@ -114,9 +114,8 @@ public:
// Constructors
- //- Construct from components.
- // newTimeOut=0 makes it do nothing.
- timer(const unsigned int newTimeOut);
+ //- Construct with specified time-out, a value of 0 makes it a no-op.
+ explicit timer(unsigned int seconds);
//- Destructor
--
GitLab