From 3a61aef4b9a96d0e8039fd9376917298a2641c27 Mon Sep 17 00:00:00 2001 From: Thomas Steinreiter Date: Wed, 23 Nov 2016 17:42:24 +0100 Subject: [PATCH] correct include syntax --- bhtree_mpi/src/mpimain.cpp | 7 ++++--- bhtree_mpi/src/simulation/MpiSimulation.cpp | 14 +++++++------- bhtree_mpi/src/simulation/MpiSimulation.hpp | 8 ++++---- bhtree_mpi/src/simulation/Simulation.cpp | 3 ++- bhtree_mpi/src/simulation/Simulation.hpp | 5 +++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/bhtree_mpi/src/mpimain.cpp b/bhtree_mpi/src/mpimain.cpp index d0fee02..7ac96b0 100644 --- a/bhtree_mpi/src/mpimain.cpp +++ b/bhtree_mpi/src/mpimain.cpp @@ -1,8 +1,9 @@ -#include -#include #include #include -#include + +#include "BarnesHutTree.hpp" +#include "MpiSimulation.hpp" +#include "Tree.hpp" int main(int argc, char* argv[]) { MPI_Init(&argc, &argv); diff --git a/bhtree_mpi/src/simulation/MpiSimulation.cpp b/bhtree_mpi/src/simulation/MpiSimulation.cpp index 27b1a61..cbd4d47 100644 --- a/bhtree_mpi/src/simulation/MpiSimulation.cpp +++ b/bhtree_mpi/src/simulation/MpiSimulation.cpp @@ -1,14 +1,14 @@ -#include +#include #include #include -#include -#include -#include -#include -#include #include -#include + #include "MpiSimulation.hpp" +#include "BarnesHutTree.hpp" +#include "Body.hpp" +#include "Box.hpp" +#include "Node.hpp" +#include "Tree.hpp" namespace nbody { MpiSimulation::MpiSimulation(const std::string& inputFile) { diff --git a/bhtree_mpi/src/simulation/MpiSimulation.hpp b/bhtree_mpi/src/simulation/MpiSimulation.hpp index 191fb61..76e15a4 100644 --- a/bhtree_mpi/src/simulation/MpiSimulation.hpp +++ b/bhtree_mpi/src/simulation/MpiSimulation.hpp @@ -1,14 +1,14 @@ #ifndef MPI_SIMULATION_HPP #define MPI_SIMULATION_HPP - -#include -#include -#include #include #include +#include #include +#include "BarnesHutTree.hpp" +#include "Simulation.hpp" + namespace nbody { struct SendStore { std::vector bodies; diff --git a/bhtree_mpi/src/simulation/Simulation.cpp b/bhtree_mpi/src/simulation/Simulation.cpp index a71e202..636c0b6 100644 --- a/bhtree_mpi/src/simulation/Simulation.cpp +++ b/bhtree_mpi/src/simulation/Simulation.cpp @@ -1,5 +1,6 @@ -#include #include +#include + #include "Simulation.hpp" namespace nbody { diff --git a/bhtree_mpi/src/simulation/Simulation.hpp b/bhtree_mpi/src/simulation/Simulation.hpp index d92a2eb..72c5573 100644 --- a/bhtree_mpi/src/simulation/Simulation.hpp +++ b/bhtree_mpi/src/simulation/Simulation.hpp @@ -2,8 +2,9 @@ #define SIMULATION_HPP #include -#include -#include + +#include "BarnesHutTree.hpp" +#include "Body.hpp" namespace nbody { //simulation superclass -- GitLab