From a05e4ae7da66405b6a771f20c45374399b539f77 Mon Sep 17 00:00:00 2001
From: "w.klijn" <w.klijn@fz-juelich.de>
Date: Thu, 9 Jun 2016 10:54:21 +0200
Subject: [PATCH] Remove spurious spaces in includes and a final include not in
correct order
---
src/fvm.hpp | 3 +--
src/mechanism.hpp | 2 --
tests/test_algorithms.cpp | 1 -
tests/test_matrix.cpp | 3 +--
tests/test_segment.cpp | 1 -
tests/test_tree.cpp | 1 -
tests/validate_ball_and_stick.cpp | 1 -
tests/validate_soma.cpp | 3 ---
8 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/fvm.hpp b/src/fvm.hpp
index 644dd48b..1dbbdfde 100644
--- a/src/fvm.hpp
+++ b/src/fvm.hpp
@@ -4,6 +4,7 @@
#include <map>
#include <string>
#include <vector>
+#include <Vector.hpp>
#include "algorithms.hpp"
#include "cell.hpp"
@@ -16,8 +17,6 @@
#include "stimulus.hpp"
#include "util.hpp"
-#include <Vector.hpp>
-
namespace nest {
namespace mc {
namespace fvm {
diff --git a/src/mechanism.hpp b/src/mechanism.hpp
index 5a487366..7a06a733 100644
--- a/src/mechanism.hpp
+++ b/src/mechanism.hpp
@@ -1,7 +1,5 @@
#pragma once
-#pragma once
-
#include <memory>
#include <string>
diff --git a/tests/test_algorithms.cpp b/tests/test_algorithms.cpp
index 7ecfa894..584bdf8a 100644
--- a/tests/test_algorithms.cpp
+++ b/tests/test_algorithms.cpp
@@ -5,7 +5,6 @@
#include "../src/algorithms.hpp"
-
TEST(algorithms, sum)
{
// sum of 10 times 2 is 20
diff --git a/tests/test_matrix.cpp b/tests/test_matrix.cpp
index 2f2587f4..f74b4798 100644
--- a/tests/test_matrix.cpp
+++ b/tests/test_matrix.cpp
@@ -3,9 +3,8 @@
#include "gtest.h"
-#include "../src/matrix.hpp"
#include "../src/math.hpp"
-
+#include "../src/matrix.hpp"
TEST(matrix, construct_from_parent_only)
{
diff --git a/tests/test_segment.cpp b/tests/test_segment.cpp
index 9c3df625..490f0e5e 100644
--- a/tests/test_segment.cpp
+++ b/tests/test_segment.cpp
@@ -4,7 +4,6 @@
#include "../src/segment.hpp"
-
TEST(segments, soma)
{
using namespace nest::mc;
diff --git a/tests/test_tree.cpp b/tests/test_tree.cpp
index 334a90cb..3db9adbb 100644
--- a/tests/test_tree.cpp
+++ b/tests/test_tree.cpp
@@ -8,7 +8,6 @@
#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 2b855022..f871610c 100644
--- a/tests/validate_ball_and_stick.cpp
+++ b/tests/validate_ball_and_stick.cpp
@@ -4,7 +4,6 @@
#include "gtest.h"
#include "util.hpp"
-
#include "../src/cell.hpp"
#include "../src/fvm.hpp"
diff --git a/tests/validate_soma.cpp b/tests/validate_soma.cpp
index 7b5c4c9b..df9ac7bd 100644
--- a/tests/validate_soma.cpp
+++ b/tests/validate_soma.cpp
@@ -1,15 +1,12 @@
#include <fstream>
#include <json.hpp>
-
#include "gtest.h"
#include "util.hpp"
#include "../src/cell.hpp"
#include "../src/fvm.hpp"
-
-
// compares results with those generated by nrn/soma.py
// single compartment model with HH channels
TEST(soma, neuron_baseline)
--
GitLab