From 20b630eb19837eeb8d083e7814931b9947531c0e Mon Sep 17 00:00:00 2001
From: "w.klijn" <w.klijn@fz-juelich.de>
Date: Thu, 9 Jun 2016 10:30:59 +0200
Subject: [PATCH] Fix inconsistent use of "" and <> includes

Use "" for local includes
Use <> for includes from include directories
---
 src/cell.hpp                      |  6 +++---
 src/fvm.hpp                       | 20 ++++++++++----------
 src/swcio.cpp                     |  8 ++++----
 src/swcio.hpp                     |  4 ++--
 tests/test_algorithms.cpp         |  7 ++++---
 tests/test_matrix.cpp             |  7 ++++---
 tests/test_mechanisms.cpp         |  4 ++--
 tests/test_parameters.cpp         |  3 +--
 tests/test_swcio.cpp              |  4 ++--
 tests/test_tree.cpp               |  5 +++--
 tests/validate_ball_and_stick.cpp |  6 +++---
 tests/validate_soma.cpp           |  8 +++++---
 12 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/cell.hpp b/src/cell.hpp
index fece1349..98b871cb 100644
--- a/src/cell.hpp
+++ b/src/cell.hpp
@@ -5,9 +5,9 @@
 #include <thread>
 #include <vector>
 
-#include <segment.hpp>
-#include <cell_tree.hpp>
-#include <stimulus.hpp>
+#include "segment.hpp"
+#include "cell_tree.hpp"
+#include "stimulus.hpp"
 
 namespace nest {
 namespace mc {
diff --git a/src/fvm.hpp b/src/fvm.hpp
index f047581e..d4bf2aaa 100644
--- a/src/fvm.hpp
+++ b/src/fvm.hpp
@@ -5,16 +5,16 @@
 #include <string>
 #include <vector>
 
-#include <algorithms.hpp>
-#include <cell.hpp>
-#include <ion.hpp>
-#include <math.hpp>
-#include <matrix.hpp>
-#include <mechanism.hpp>
-#include <mechanism_interface.hpp>
-#include <util.hpp>
-#include <segment.hpp>
-#include <stimulus.hpp>
+#include "algorithms.hpp"
+#include "cell.hpp"
+#include "ion.hpp"
+#include "math.hpp"
+#include "matrix.hpp"
+#include "mechanism.hpp"
+#include "mechanism_interface.hpp"
+#include "util.hpp"
+#include "segment.hpp"
+#include "stimulus.hpp"
 
 #include <Vector.hpp>
 
diff --git a/src/swcio.cpp b/src/swcio.cpp
index f9667644..792d0fc7 100644
--- a/src/swcio.cpp
+++ b/src/swcio.cpp
@@ -4,10 +4,10 @@
 #include <sstream>
 #include <unordered_set>
 
-#include <algorithms.hpp>
-#include <point.hpp>
-#include <swcio.hpp>
-#include <util.hpp>
+#include "algorithms.hpp"
+#include "point.hpp"
+#include "swcio.hpp"
+#include "util.hpp"
 
 namespace nest {
 namespace mc {
diff --git a/src/swcio.hpp b/src/swcio.hpp
index a58bbac9..70f979cd 100644
--- a/src/swcio.hpp
+++ b/src/swcio.hpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include <cell.hpp>
-#include <point.hpp>
+#include "cell.hpp"
+#include "point.hpp"
 
 namespace nest {
 namespace mc {
diff --git a/tests/test_algorithms.cpp b/tests/test_algorithms.cpp
index f69569c9..7ecfa894 100644
--- a/tests/test_algorithms.cpp
+++ b/tests/test_algorithms.cpp
@@ -1,9 +1,10 @@
+#include <vector>
+
 #include "gtest.h"
+#include "util.hpp"
 
-#include <vector>
+#include "../src/algorithms.hpp"
 
-#include <algorithms.hpp>
-#include <util.hpp>
 
 TEST(algorithms, sum)
 {
diff --git a/tests/test_matrix.cpp b/tests/test_matrix.cpp
index 07738a6c..2f2587f4 100644
--- a/tests/test_matrix.cpp
+++ b/tests/test_matrix.cpp
@@ -1,10 +1,11 @@
 #include <numeric>
+#include <vector>
 
 #include "gtest.h"
 
-#include <matrix.hpp>
-#include <math.hpp>
-#include <Vector.hpp>
+#include "../src/matrix.hpp"
+#include "../src/math.hpp"
+
 
 TEST(matrix, construct_from_parent_only)
 {
diff --git a/tests/test_mechanisms.cpp b/tests/test_mechanisms.cpp
index d61c89d2..aef84890 100644
--- a/tests/test_mechanisms.cpp
+++ b/tests/test_mechanisms.cpp
@@ -1,7 +1,7 @@
 #include "gtest.h"
 
-#include <mechanism_interface.hpp>
-#include <matrix.hpp>
+#include "../src/mechanism_interface.hpp"
+#include "../src/matrix.hpp"
 
 TEST(mechanisms, helpers) {
     nest::mc::mechanisms::setup_mechanism_helpers();
diff --git a/tests/test_parameters.cpp b/tests/test_parameters.cpp
index 0dce58b0..8a4b0d20 100644
--- a/tests/test_parameters.cpp
+++ b/tests/test_parameters.cpp
@@ -1,10 +1,9 @@
-
 #include <fstream>
 
 #include "gtest.h"
 #include "util.hpp"
 
-#include <parameter_list.hpp>
+#include "../src/parameter_list.hpp"
 
 // test out the parameter infrastructure
 TEST(parameters, setting)
diff --git a/tests/test_swcio.cpp b/tests/test_swcio.cpp
index 6968fd43..c3fc24d3 100644
--- a/tests/test_swcio.cpp
+++ b/tests/test_swcio.cpp
@@ -8,8 +8,8 @@
 
 #include "gtest.h"
 
-#include <cell.hpp>
-#include <swcio.hpp>
+#include "../src/cell.hpp"
+#include "../src/swcio.hpp"
 
 // SWC tests
 void expect_record_equals(const nest::mc::io::swc_record &expected,
diff --git a/tests/test_tree.cpp b/tests/test_tree.cpp
index 696ef886..d9337055 100644
--- a/tests/test_tree.cpp
+++ b/tests/test_tree.cpp
@@ -2,11 +2,12 @@
 #include <fstream>
 #include <numeric>
 #include <vector>
+#include <json.hpp>
 
 #include "gtest.h"
 
-#include <cell_tree.hpp>
-#include <json.hpp>
+#include "../src/cell_tree.hpp"
+
 
 using json = nlohmann::json;
 using range = memory::Range;
diff --git a/tests/validate_ball_and_stick.cpp b/tests/validate_ball_and_stick.cpp
index 6e8098bd..2b855022 100644
--- a/tests/validate_ball_and_stick.cpp
+++ b/tests/validate_ball_and_stick.cpp
@@ -1,12 +1,12 @@
 #include <fstream>
+#include <json.hpp>
 
 #include "gtest.h"
 #include "util.hpp"
 
-#include <cell.hpp>
-#include <fvm.hpp>
 
-#include <json.hpp>
+#include "../src/cell.hpp"
+#include "../src/fvm.hpp"
 
 // compares results with those generated by nrn/ball_and_stick.py
 TEST(ball_and_stick, neuron_baseline)
diff --git a/tests/validate_soma.cpp b/tests/validate_soma.cpp
index 162242b5..7b5c4c9b 100644
--- a/tests/validate_soma.cpp
+++ b/tests/validate_soma.cpp
@@ -1,12 +1,14 @@
 #include <fstream>
+#include <json.hpp>
+
 
 #include "gtest.h"
 #include "util.hpp"
 
-#include <cell.hpp>
-#include <fvm.hpp>
+#include "../src/cell.hpp"
+#include "../src/fvm.hpp"
+
 
-#include <json.hpp>
 
 // compares results with those generated by nrn/soma.py
 // single compartment model with HH channels
-- 
GitLab