From 54f986d095850170305742f51ff9485639e5d976 Mon Sep 17 00:00:00 2001 From: "w.klijn" <w.klijn@fz-juelich.de> Date: Thu, 9 Jun 2016 10:50:42 +0200 Subject: [PATCH] Sort all includes alphabetically (yes, I'm one of 'those' programmers) --- src/algorithms.hpp | 3 +-- src/fvm.hpp | 2 +- src/ion.hpp | 1 + src/math.hpp | 3 ++- src/matrix.hpp | 3 +-- src/mechanism.hpp | 2 +- src/segment.hpp | 3 +-- src/tree.hpp | 5 ++--- tests/test_point.cpp | 2 +- tests/test_tree.cpp | 4 ++-- tests/util.hpp | 9 ++++----- 11 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/algorithms.hpp b/src/algorithms.hpp index b3943c68..83eeaf8d 100644 --- a/src/algorithms.hpp +++ b/src/algorithms.hpp @@ -1,8 +1,7 @@ #pragma once -#include <iostream> - #include <algorithm> +#include <iostream> #include <numeric> #include <type_traits> #include <vector> diff --git a/src/fvm.hpp b/src/fvm.hpp index d4bf2aaa..644dd48b 100644 --- a/src/fvm.hpp +++ b/src/fvm.hpp @@ -12,9 +12,9 @@ #include "matrix.hpp" #include "mechanism.hpp" #include "mechanism_interface.hpp" -#include "util.hpp" #include "segment.hpp" #include "stimulus.hpp" +#include "util.hpp" #include <Vector.hpp> diff --git a/src/ion.hpp b/src/ion.hpp index 990eefcc..883658b4 100644 --- a/src/ion.hpp +++ b/src/ion.hpp @@ -1,6 +1,7 @@ #pragma once #include <Vector.hpp> + #include "indexed_view.hpp" namespace nest { diff --git a/src/math.hpp b/src/math.hpp index 86eccfce..006a429e 100644 --- a/src/math.hpp +++ b/src/math.hpp @@ -1,7 +1,8 @@ #pragma once -#include <utility> #include <cmath> +#include <utility> + namespace nest { namespace mc { diff --git a/src/matrix.hpp b/src/matrix.hpp index fe650190..889a3e51 100644 --- a/src/matrix.hpp +++ b/src/matrix.hpp @@ -1,11 +1,10 @@ #pragma once #include <type_traits> +#include <Vector.hpp> #include "util.hpp" -#include <Vector.hpp> - namespace nest { namespace mc { diff --git a/src/mechanism.hpp b/src/mechanism.hpp index ea69c292..5a487366 100644 --- a/src/mechanism.hpp +++ b/src/mechanism.hpp @@ -6,9 +6,9 @@ #include <string> #include "indexed_view.hpp" +#include "ion.hpp" #include "parameter_list.hpp" #include "util.hpp" -#include "ion.hpp" namespace nest { namespace mc { diff --git a/src/segment.hpp b/src/segment.hpp index decb0cdd..c6c49b26 100644 --- a/src/segment.hpp +++ b/src/segment.hpp @@ -1,14 +1,13 @@ #pragma once #include <cmath> - #include <vector> +#include "algorithms.hpp" #include "compartment.hpp" #include "math.hpp" #include "parameter_list.hpp" #include "point.hpp" -#include "algorithms.hpp" #include "util.hpp" namespace nest { diff --git a/src/tree.hpp b/src/tree.hpp index 72e22e83..7d702cc2 100644 --- a/src/tree.hpp +++ b/src/tree.hpp @@ -1,12 +1,11 @@ #pragma once #include <algorithm> +#include <cassert> #include <numeric> #include <vector> - -#include <cassert> - #include <Vector.hpp> + #include "algorithms.hpp" #include "util.hpp" diff --git a/tests/test_point.cpp b/tests/test_point.cpp index b5bfeb9c..27b5bf70 100644 --- a/tests/test_point.cpp +++ b/tests/test_point.cpp @@ -1,5 +1,5 @@ -#include <limits> #include <cmath> +#include <limits> #include "gtest.h" diff --git a/tests/test_tree.cpp b/tests/test_tree.cpp index d9337055..334a90cb 100644 --- a/tests/test_tree.cpp +++ b/tests/test_tree.cpp @@ -1,8 +1,8 @@ -#include <iostream> #include <fstream> +#include <iostream> +#include <json.hpp> #include <numeric> #include <vector> -#include <json.hpp> #include "gtest.h" diff --git a/tests/util.hpp b/tests/util.hpp index bdc21531..92a9bcb5 100644 --- a/tests/util.hpp +++ b/tests/util.hpp @@ -1,14 +1,13 @@ +#include <chrono> +#include <cmath> #include <fstream> +#include <iomanip> #include <iostream> #include <string> #include <vector> -#include <iomanip> -#include <chrono> -#include <cmath> - -#include <util.hpp> #include <json.hpp> +#include <util.hpp> // helpful code for running tests // a bit messy: refactor when it gets heavier and obvious patterns emerge... -- GitLab