From d71976dcb7051c4368ddac999f2daf5242105010 Mon Sep 17 00:00:00 2001 From: igor Date: Wed, 28 Mar 2018 15:40:56 +0300 Subject: [PATCH] Unify names in #include statements --- Source/Headers/inmost_data.h | 2 +- Source/Headers/inmost_mesh.h | 2 +- Source/Solver/SolverMaster.h | 2 +- Source/Solver/solver.cpp | 4 ++-- Source/Solver/solver_ani/SolverANI.h | 2 +- Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp | 2 +- Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h | 2 +- Source/Solver/solver_inner/SolverInner.h | 4 ++-- Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp | 4 ++-- Source/Solver/solver_k3biilu2/SolverK3BIILU2.h | 2 +- Source/Solver/solver_petsc/SolverPETSc.h | 4 ++-- Source/Solver/solver_superlu/SolverSUPERLU.h | 2 +- Source/Solver/solver_trilinos/SolverTrilinos.h | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Source/Headers/inmost_data.h b/Source/Headers/inmost_data.h index b2c9b34..8de3f14 100644 --- a/Source/Headers/inmost_data.h +++ b/Source/Headers/inmost_data.h @@ -906,7 +906,7 @@ namespace INMOST } //Implementation of inlined functions -//#include "Source/Data/tag_inline.hpp" +//#include "../Data/tag_inline.hpp" #endif diff --git a/Source/Headers/inmost_mesh.h b/Source/Headers/inmost_mesh.h index 944bfeb..098840f 100644 --- a/Source/Headers/inmost_mesh.h +++ b/Source/Headers/inmost_mesh.h @@ -3704,7 +3704,7 @@ namespace INMOST } //Implementation of inlined functions -//#include "Source/Data/storage_inline.hpp" +//#include "../Data/storage_inline.hpp" #endif diff --git a/Source/Solver/SolverMaster.h b/Source/Solver/SolverMaster.h index 5455653..5271ce0 100644 --- a/Source/Solver/SolverMaster.h +++ b/Source/Solver/SolverMaster.h @@ -1,7 +1,7 @@ #ifndef INMOST_SOLVER_MASTER #define INMOST_SOLVER_MASTER -#include +#include <../Solver/SolverInterface.h> #if defined(USE_SOLVER) namespace INMOST { diff --git a/Source/Solver/solver.cpp b/Source/Solver/solver.cpp index e2f84a5..b9e599e 100644 --- a/Source/Solver/solver.cpp +++ b/Source/Solver/solver.cpp @@ -1,6 +1,6 @@ #include #include "SolverMaster.h" -#include "Source/Misc/utils.h" +#include "../Misc/utils.h" #if defined(USE_SOLVER) namespace INMOST { @@ -260,4 +260,4 @@ namespace INMOST { } -#endif //USE_SOLVER \ No newline at end of file +#endif //USE_SOLVER diff --git a/Source/Solver/solver_ani/SolverANI.h b/Source/Solver/solver_ani/SolverANI.h index 8555877..5ddc88b 100644 --- a/Source/Solver/solver_ani/SolverANI.h +++ b/Source/Solver/solver_ani/SolverANI.h @@ -1,7 +1,7 @@ #ifndef INMOST_SOLVERANI_H #define INMOST_SOLVERANI_H -#include "Source/Solver/SolverInterface.h" +#include "../Solver/SolverInterface.h" #include "solver_ani.h" namespace INMOST { diff --git a/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp b/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp index 33faec6..c0babe9 100644 --- a/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp +++ b/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp @@ -1,4 +1,4 @@ -#include +#include <../Misc/utils.h> #include "SolverFCBIILU2.h" #include "solver_fcbiilu2.h" diff --git a/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h b/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h index c3524ed..9c23d9e 100644 --- a/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h +++ b/Source/Solver/solver_fcbiilu2/SolverFCBIILU2.h @@ -1,7 +1,7 @@ #ifndef INMOST_SOLVERFCBIILU2_H #define INMOST_SOLVERFCBIILU2_H -#include "Source/Solver/SolverInterface.h" +#include "../Solver/SolverInterface.h" #include "solver_fcbiilu2.h" namespace INMOST { diff --git a/Source/Solver/solver_inner/SolverInner.h b/Source/Solver/solver_inner/SolverInner.h index 0038023..ccd5580 100644 --- a/Source/Solver/solver_inner/SolverInner.h +++ b/Source/Solver/solver_inner/SolverInner.h @@ -1,8 +1,8 @@ #ifndef INMOST_SOLVERINNER_H #define INMOST_SOLVERINNER_H -#include "Source/Solver/SolverInterface.h" -#include "Source/Misc/utils.h" +#include "../Solver/SolverInterface.h" +#include "../Misc/utils.h" #include "solver_prototypes.hpp" #include "solver_bcgsl.hpp" #define KSOLVER BCGSL_solver diff --git a/Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp b/Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp index d50a77d..6069d06 100644 --- a/Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp +++ b/Source/Solver/solver_k3biilu2/SolverK3BIILU2.cpp @@ -1,7 +1,7 @@ #include "SolverK3BIILU2.h" #include "solver_k3biilu2.h" -#include -#include +#include <../Misc/utils.h> +#include <../Solver/solver_inner/SolverInner.h> namespace INMOST { diff --git a/Source/Solver/solver_k3biilu2/SolverK3BIILU2.h b/Source/Solver/solver_k3biilu2/SolverK3BIILU2.h index 1ad4597..4f9a085 100644 --- a/Source/Solver/solver_k3biilu2/SolverK3BIILU2.h +++ b/Source/Solver/solver_k3biilu2/SolverK3BIILU2.h @@ -1,7 +1,7 @@ #ifndef INMOST_SOLVERK3BIILU2_H #define INMOST_SOLVERK3BIILU2_H -#include "Source/Solver/SolverInterface.h" +#include "../Solver/SolverInterface.h" #include "solver_k3biilu2.h" namespace INMOST { diff --git a/Source/Solver/solver_petsc/SolverPETSc.h b/Source/Solver/solver_petsc/SolverPETSc.h index 832d2d2..243d241 100644 --- a/Source/Solver/solver_petsc/SolverPETSc.h +++ b/Source/Solver/solver_petsc/SolverPETSc.h @@ -3,8 +3,8 @@ #include "petsc.h" #include "solver_petsc.h" -#include "Source/Solver/SolverInterface.h" -#include "Source/Misc/utils.h" +#include "../Solver/SolverInterface.h" +#include "../Misc/utils.h" namespace INMOST { diff --git a/Source/Solver/solver_superlu/SolverSUPERLU.h b/Source/Solver/solver_superlu/SolverSUPERLU.h index 2982098..0907a65 100644 --- a/Source/Solver/solver_superlu/SolverSUPERLU.h +++ b/Source/Solver/solver_superlu/SolverSUPERLU.h @@ -1,7 +1,7 @@ #ifndef INMOST_SOLVERSUPERLU_H #define INMOST_SOLVERSUPERLU_H -#include "Source/Solver/SolverInterface.h" +#include "../Solver/SolverInterface.h" #include "superlu/slu_ddefs.h" namespace INMOST { diff --git a/Source/Solver/solver_trilinos/SolverTrilinos.h b/Source/Solver/solver_trilinos/SolverTrilinos.h index d843492..9847af9 100644 --- a/Source/Solver/solver_trilinos/SolverTrilinos.h +++ b/Source/Solver/solver_trilinos/SolverTrilinos.h @@ -7,8 +7,8 @@ #include -#include "Source/Solver/SolverInterface.h" -#include "Source/Misc/utils.h" +#include "../Solver/SolverInterface.h" +#include "../Misc/utils.h" #if defined(USE_MPI) -- 2.26.2