From 5e09580c8ec41a52df5f4949e2f912bab5332b27 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 31 Jul 2012 15:07:30 +0000
Subject: [PATCH] Replace C headers <*.h> by C++ headers <c*> where possible.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8777 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 dumux/common/propertysystem.hh                             | 3 +--
 dumux/common/tabulated2dfunction.hh                        | 2 +-
 dumux/material/components/h2o.hh                           | 6 +++---
 dumux/material/components/tabulatedcomponent.hh            | 6 +++---
 dumux/material/eos/pengrobinsonmixture.hh                  | 1 -
 dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh  | 5 ++---
 dumux/material/fluidsystems/1pfluidsystem.hh               | 6 +++---
 dumux/material/fluidsystems/2pimmisciblefluidsystem.hh     | 7 +++----
 dumux/material/fluidsystems/h2oairfluidsystem.hh           | 4 ++--
 dumux/material/fluidsystems/h2on2fluidsystem.hh            | 4 ++--
 dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh | 4 ++--
 dumux/material/fluidsystems/spe5parametercache.hh          | 4 ++--
 dumux/parallel/mpibuffer.hh                                | 2 +-
 13 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index bf578abaa6..cdbf6885bb 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -55,8 +55,7 @@
 #include <string>
 #include <iostream>
 #include <sstream>
-
-#include <string.h>
+#include <cstring>
 
 namespace Dumux
 {
diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh
index bdeb6a8734..1be18ed3d5 100644
--- a/dumux/common/tabulated2dfunction.hh
+++ b/dumux/common/tabulated2dfunction.hh
@@ -27,7 +27,7 @@
 #define DUMUX_TABULATED_2D_FUNCTION_HH
 
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 namespace Dumux
 {
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 5d874c6b04..70e9db38a6 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -29,6 +29,9 @@
 #ifndef DUMUX_H2O_HH
 #define DUMUX_H2O_HH
 
+#include <cmath>
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/valgrind.hh>
@@ -40,9 +43,6 @@
 #include "iapws/region2.hh"
 #include "iapws/region4.hh"
 
-#include <cmath>
-#include <assert.h>
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 363493a272..4dd46a7a84 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -31,13 +31,13 @@
 #ifndef DUMUX_TABULATED_COMPONENT_HH
 #define DUMUX_TABULATED_COMPONENT_HH
 
-#include <dumux/common/exceptions.hh>
 #include <cmath>
 #include <limits>
-#include <assert.h>
-
+#include <cassert>
 #include <iostream>
 
+#include <dumux/common/exceptions.hh>
+
 namespace Dumux
 {
 
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index 2a0c20deb4..faeb00d384 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -28,7 +28,6 @@
 #ifndef DUMUX_PENG_ROBINSON_MIXTURE_HH
 #define DUMUX_PENG_ROBINSON_MIXTURE_HH
 
-#include <stdlib.h>
 #include "pengrobinson.hh"
 
 #include <dumux/material/constants.hh>
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 92baf2aa1c..06629e8933 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -31,9 +31,8 @@
 #include "vangenuchtenparams.hh"
 
 #include <algorithm>
-
-#include <math.h>
-#include <assert.h>
+#include <cmath>
+#include <cassert>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh
index d3cc684018..4102282383 100644
--- a/dumux/material/fluidsystems/1pfluidsystem.hh
+++ b/dumux/material/fluidsystems/1pfluidsystem.hh
@@ -27,6 +27,9 @@
 #ifndef DUMUX_1P_FLUIDSYSTEM_HH
 #define DUMUX_1P_FLUIDSYSTEM_HH
 
+#include <limits>
+#include <cassert>
+
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 
@@ -37,9 +40,6 @@
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/n2.hh>
 #include <dumux/material/components/tabulatedcomponent.hh>
-#include <limits>
-
-#include <assert.h>
 
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
index 70b21a293b..0153b1eb60 100644
--- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
+++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
@@ -32,6 +32,9 @@
 #ifndef DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
 #define DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
 
+#include <limits>
+#include <cassert>
+
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
@@ -40,10 +43,6 @@
 
 #include "basefluidsystem.hh"
 
-#include <limits>
-
-#include <assert.h>
-
 namespace Dumux {
 namespace FluidSystems {
 
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index c24249fecf..872ac42202 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -31,6 +31,8 @@
 #ifndef DUMUX_H2O_AIR_SYSTEM_HH
 #define DUMUX_H2O_AIR_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/fluidsystems/basefluidsystem.hh>
@@ -42,8 +44,6 @@
 #include <dumux/common/valgrind.hh>
 #include <dumux/common/exceptions.hh>
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/propertysystem.hh>
 #include <dumux/common/basicproperties.hh>
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index 725e1b4a53..cea5690d03 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -27,6 +27,8 @@
 #ifndef DUMUX_H2O_N2_FLUID_SYSTEM_HH
 #define DUMUX_H2O_N2_FLUID_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/components/n2.hh>
@@ -40,8 +42,6 @@
 
 #include "basefluidsystem.hh"
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
 #include <dumux/material/fluidsystems/defaultcomponents.hh>
diff --git a/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh b/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
index 155f7a6a06..c66b7f436c 100644
--- a/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
@@ -28,6 +28,8 @@
 #ifndef DUMUX_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
 #define DUMUX_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/components/n2.hh>
@@ -41,8 +43,6 @@
 
 #include <dumux/material/fluidsystems/basefluidsystem.hh>
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
 #include <dumux/material/fluidsystems/defaultcomponents.hh>
diff --git a/dumux/material/fluidsystems/spe5parametercache.hh b/dumux/material/fluidsystems/spe5parametercache.hh
index 1772d53f0d..bfef0ba5de 100644
--- a/dumux/material/fluidsystems/spe5parametercache.hh
+++ b/dumux/material/fluidsystems/spe5parametercache.hh
@@ -28,14 +28,14 @@
 #ifndef SPE5_PARAMETER_CACHE_HH
 #define SPE5_PARAMETER_CACHE_HH
 
+#include <cassert>
+
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/fluidsystems/parametercachebase.hh>
 
 #include <dumux/material/eos/pengrobinson.hh>
 #include <dumux/material/eos/pengrobinsonparamsmixture.hh>
 
-#include <assert.h>
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/parallel/mpibuffer.hh b/dumux/parallel/mpibuffer.hh
index 5b229f1fac..b94c63ca07 100644
--- a/dumux/parallel/mpibuffer.hh
+++ b/dumux/parallel/mpibuffer.hh
@@ -27,7 +27,7 @@
 #ifndef DUMUX_MPI_BUFFER_HH
 #define DUMUX_MPI_BUFFER_HH
 
-#include <assert.h>
+#include <cassert>
 
 #if HAVE_MPI
 #include <mpi.h>
-- 
GitLab