From 34c3b2f656761a52f08a49ad1567146f5a4089c6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 28 Jun 2015 22:55:22 +0100
Subject: [PATCH] Pstream/mpi: Move mpi.h include to after the OpenFOAM
includes Resolves additional report
http://www.openfoam.org/mantisbt/view.php?id=1474
---
src/Pstream/mpi/PstreamGlobals.H | 6 +++---
src/Pstream/mpi/UIPread.C | 6 +++---
src/Pstream/mpi/UOPwrite.C | 6 +++---
src/Pstream/mpi/UPstream.C | 4 ++--
src/Pstream/mpi/allReduce.H | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/Pstream/mpi/PstreamGlobals.H b/src/Pstream/mpi/PstreamGlobals.H
index 45496082208..f87a55b0cf2 100644
--- a/src/Pstream/mpi/PstreamGlobals.H
+++ b/src/Pstream/mpi/PstreamGlobals.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,10 +36,10 @@ SourceFiles
#ifndef PstreamGlobals_H
#define PstreamGlobals_H
-#include "mpi.h"
-
#include "DynamicList.H"
+#include <mpi.h>
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
diff --git a/src/Pstream/mpi/UIPread.C b/src/Pstream/mpi/UIPread.C
index 55b9973ff83..4570c6d6de2 100644
--- a/src/Pstream/mpi/UIPread.C
+++ b/src/Pstream/mpi/UIPread.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,12 +26,12 @@ Description
\*---------------------------------------------------------------------------*/
-#include "mpi.h"
-
#include "UIPstream.H"
#include "PstreamGlobals.H"
#include "IOstreams.H"
+#include <mpi.h>
+
// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
Foam::UIPstream::UIPstream
diff --git a/src/Pstream/mpi/UOPwrite.C b/src/Pstream/mpi/UOPwrite.C
index 1c27ec1dbf8..7d84d3f8371 100644
--- a/src/Pstream/mpi/UOPwrite.C
+++ b/src/Pstream/mpi/UOPwrite.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,11 +26,11 @@ Description
\*---------------------------------------------------------------------------*/
-#include "mpi.h"
-
#include "UOPstream.H"
#include "PstreamGlobals.H"
+#include <mpi.h>
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::UOPstream::write
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index d6db5a39cf3..0c78f86514f 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/
-#include "mpi.h"
-
#include "UPstream.H"
#include "PstreamReduceOps.H"
#include "OSspecific.H"
@@ -32,6 +30,8 @@ License
#include "SubList.H"
#include "allReduce.H"
+#include <mpi.h>
+
#include <cstring>
#include <cstdlib>
#include <csignal>
diff --git a/src/Pstream/mpi/allReduce.H b/src/Pstream/mpi/allReduce.H
index 04b791cef89..fae4ff99eac 100644
--- a/src/Pstream/mpi/allReduce.H
+++ b/src/Pstream/mpi/allReduce.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,10 +35,10 @@ SourceFiles
#ifndef allReduce_H
#define allReduce_H
-#include "mpi.h"
-
#include "UPstream.H"
+#include <mpi.h>
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
--
GitLab