From 1d139d77868692e403e27bef88f9bf9ee939b981 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Tue, 18 Dec 2012 16:15:36 +0100
Subject: [PATCH] Cleaned some include
When using IFile or OFile only, it is sufficient to include
one of the two header files.
---
src/analysis/Analysis.cpp | 1 +
src/analysis/Histogram.cpp | 2 ++
src/core/PlumedMain.cpp | 1 +
src/generic/Read.cpp | 1 +
src/tools/KernelFunctions.cpp | 1 +
src/tools/Log.h | 2 +-
src/tools/OFile.h | 2 ++
src/tools/Tools.cpp | 2 +-
8 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/analysis/Analysis.cpp b/src/analysis/Analysis.cpp
index d427897d4..da39c2d6d 100644
--- a/src/analysis/Analysis.cpp
+++ b/src/analysis/Analysis.cpp
@@ -25,6 +25,7 @@
#include "core/ActionWithValue.h"
#include "core/PlumedMain.h"
#include "core/Atoms.h"
+#include "tools/IFile.h"
namespace PLMD {
namespace analysis {
diff --git a/src/analysis/Histogram.cpp b/src/analysis/Histogram.cpp
index 52dc930ce..1e06b421a 100644
--- a/src/analysis/Histogram.cpp
+++ b/src/analysis/Histogram.cpp
@@ -23,6 +23,8 @@
#include "core/ActionRegister.h"
#include "tools/Grid.h"
#include "tools/KernelFunctions.h"
+#include "tools/IFile.h"
+#include "tools/OFile.h"
namespace PLMD{
namespace analysis{
diff --git a/src/core/PlumedMain.cpp b/src/core/PlumedMain.cpp
index 20439f4ad..a888f1c81 100644
--- a/src/core/PlumedMain.cpp
+++ b/src/core/PlumedMain.cpp
@@ -42,6 +42,7 @@
#include "tools/Stopwatch.h"
#include "tools/Citations.h"
#include "ExchangePatterns.h"
+#include "tools/IFile.h"
using namespace std;
diff --git a/src/generic/Read.cpp b/src/generic/Read.cpp
index bfaca652a..e4af6ef94 100644
--- a/src/generic/Read.cpp
+++ b/src/generic/Read.cpp
@@ -25,6 +25,7 @@
#include "core/PlumedMain.h"
#include "core/ActionSet.h"
#include "core/Atoms.h"
+#include "tools/IFile.h"
namespace PLMD{
namespace generic{
diff --git a/src/tools/KernelFunctions.cpp b/src/tools/KernelFunctions.cpp
index a2c8211e1..940f9eff3 100644
--- a/src/tools/KernelFunctions.cpp
+++ b/src/tools/KernelFunctions.cpp
@@ -20,6 +20,7 @@
along with plumed. If not, see <http://www.gnu.org/licenses/>.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
#include "KernelFunctions.h"
+#include "IFile.h"
namespace PLMD {
diff --git a/src/tools/Log.h b/src/tools/Log.h
index b2c3a8322..e31aedcfa 100644
--- a/src/tools/Log.h
+++ b/src/tools/Log.h
@@ -22,7 +22,7 @@
#ifndef __PLUMED_tools_Log_h
#define __PLUMED_tools_Log_h
-#include "File.h"
+#include "OFile.h"
namespace PLMD{
diff --git a/src/tools/OFile.h b/src/tools/OFile.h
index b7df1c0be..821abe0e3 100644
--- a/src/tools/OFile.h
+++ b/src/tools/OFile.h
@@ -28,6 +28,8 @@
namespace PLMD{
+class Value;
+
/**
\ingroup TOOLBOX
Class for output files
diff --git a/src/tools/Tools.cpp b/src/tools/Tools.cpp
index aa3fb03d1..f7a12edb9 100644
--- a/src/tools/Tools.cpp
+++ b/src/tools/Tools.cpp
@@ -23,7 +23,7 @@
#include "Tools.h"
#include "AtomNumber.h"
#include "Exception.h"
-#include "File.h"
+#include "IFile.h"
#include <cstring>
#include <dirent.h>
--
GitLab