Skip to content

Commit f4b4941

Browse files
committed
Fixed horrible kernel_manager singleton design and cleaned up all circular include chains
1 parent b9bdcc7 commit f4b4941

File tree

283 files changed

+6368
-7358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+6368
-7358
lines changed

doc/htmldoc/developer_space/guidelines/coding_guidelines_cpp.rst

Lines changed: 457 additions & 175 deletions
Large diffs are not rendered by default.

doc/htmldoc/networks/spatially_structured_networks.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,6 @@ files for the ``Mask`` parent class:
15161516
.. code:: c
15171517
15181518
#include "mask.h"
1519-
#include "mask_impl.h"
15201519
15211520
The ``Mask`` class has a few methods that must be overridden:
15221521

libnestutil/dict_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
// Includes from nestkernel:
2727
#include "kernel_manager.h"
28+
#include "nest.h"
2829
#include "nest_datums.h"
29-
#include "vp_manager_impl.h"
3030

3131
// Includes from sli:
3232
#include "dictdatum.h"

models/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ set(models_sources
2323
weight_recorder.h weight_recorder.cpp # Required by CommonSynapseProperties
2424
cm_compartmentcurrents.h cm_compartmentcurrents.cpp
2525
cm_tree.h cm_tree.cpp
26-
rate_neuron_ipn.h rate_neuron_ipn_impl.h
27-
rate_neuron_opn.h rate_neuron_opn_impl.h
28-
rate_transformer_node.h rate_transformer_node_impl.h
29-
weight_optimizer.h weight_optimizer.cpp
26+
rate_neuron_ipn.h
27+
rate_neuron_opn.h
28+
rate_transformer_node.h
29+
weight_optimizer.h weight_optimizer.cpp
3030
${MODELS_SOURCES_GENERATED}
3131
)
3232

models/ac_generator.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
#include "numerics.h"
3131

3232
// Includes from nestkernel:
33-
#include "event_delivery_manager_impl.h"
33+
#include "event_delivery_manager.h"
3434
#include "kernel_manager.h"
35-
#include "nest_impl.h"
36-
#include "universal_data_logger_impl.h"
3735

3836
// Includes from sli:
3937
#include "dict.h"

models/aeif_cond_alpha.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
// Includes from nestkernel:
3838
#include "exceptions.h"
3939
#include "kernel_manager.h"
40-
#include "nest_impl.h"
4140
#include "nest_names.h"
42-
#include "universal_data_logger_impl.h"
4341

4442
// Includes from sli:
4543
#include "dictutils.h"

models/aeif_cond_alpha_astro.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
// Includes from nestkernel:
3838
#include "exceptions.h"
3939
#include "kernel_manager.h"
40-
#include "nest_impl.h"
4140
#include "nest_names.h"
42-
#include "universal_data_logger_impl.h"
4341

4442
// Includes from sli:
4543
#include "dictutils.h"

models/aeif_cond_alpha_multisynapse.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
// Includes from nestkernel:
3535
#include "exceptions.h"
3636
#include "kernel_manager.h"
37-
#include "nest_impl.h"
38-
#include "universal_data_logger_impl.h"
3937

4038
// Includes from sli:
4139
#include "dict.h"

models/aeif_cond_beta_multisynapse.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
// Includes from nestkernel:
3636
#include "exceptions.h"
3737
#include "kernel_manager.h"
38-
#include "nest_impl.h"
39-
#include "universal_data_logger_impl.h"
4038

4139
// Includes from sli:
4240
#include "dict.h"

models/aeif_cond_exp.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
// Includes from nestkernel:
3838
#include "exceptions.h"
3939
#include "kernel_manager.h"
40-
#include "nest_impl.h"
4140
#include "nest_names.h"
42-
#include "universal_data_logger_impl.h"
4341

4442
// Includes from sli:
4543
#include "dictutils.h"

0 commit comments

Comments
 (0)