complete commit 3e2d0528999
authorandrei zavada <johnhommer@gmail.com>
Sun, 7 Dec 2014 23:26:32 +0000 (01:26 +0200)
committerandrei zavada <johnhommer@gmail.com>
Sun, 7 Dec 2014 23:26:32 +0000 (01:26 +0200)
upstream/src/libcnrun/integrator/base.hh
upstream/src/libcnrun/model/model.hh
upstream/src/libcnrun/model/sources.hh
upstream/src/libcnrun/units/base-unit.hh
upstream/src/tools/Makefile.am
upstream/src/tools/hh-latency-estimator.cc

index 1fe3696234a7fc33a5c8b08a81d10f0fb9bb5924..669310bc9ab2ebe4211dcd6f1f33615d227aeebb 100644 (file)
@@ -18,7 +18,7 @@
 #endif
 
 #include "libstilton/lang.hh"
-#include "model/forward-decls.hh"
+#include "../model/forward-decls.hh"
 
 
 namespace cnrun {
index 093a025ba57f96d2604abdefa72ccc0ab4f1f35a..88c2c3fad4fa9180a3aa625066438ac6afa22303 100644 (file)
@@ -38,13 +38,13 @@ parameters.
 
 #include "libstilton/misc.hh"
 #include "forward-decls.hh"
-#include "units/base-neuron.hh"
-#include "units/base-synapse.hh"
-#include "units/hosted-neurons.hh"
-#include "units/hosted-synapses.hh"
-#include "units/standalone-neurons.hh"
-#include "units/standalone-synapses.hh"
-#include "integrator/rk65.hh"
+#include "../units/base-neuron.hh"
+#include "../units/base-synapse.hh"
+#include "../units/hosted-neurons.hh"
+#include "../units/hosted-synapses.hh"
+#include "../units/standalone-neurons.hh"
+#include "../units/standalone-synapses.hh"
+#include "../integrator/rk65.hh"
 
 
 using namespace std;
index 9d1b5d7095449e39f73275aed86d0398e47fcc11..59996468a309b49dfceeba4fe93a1b75490de4ed 100644 (file)
@@ -23,7 +23,7 @@
 #include <gsl/gsl_rng.h>
 
 #include "libstilton/lang.hh"
-#include "units/forward-decls.hh"
+#include "../units/forward-decls.hh"
 
 
 using namespace std;
index cb235fb7fbd1bd3176796ef405a32c536c35a3e7..569ce39b8e469bc287294217995565645e4091ad 100644 (file)
@@ -25,9 +25,9 @@
 #include "libstilton/lang.hh"
 #include "libstilton/string.hh"
 #include "forward-decls.hh"
-#include "model/forward-decls.hh"
+#include "../model/forward-decls.hh"
 #include "types.hh"
-#include "model/sources.hh"
+#include "../model/sources.hh"
 
 
 using namespace std;
index ef7815eb5d6388b1825fbe9420342eeeed904196..25ff05fb9333d6fb3e2efda6fe206ce545d3e507 100644 (file)
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.mk
 
 AM_CXXFLAGS += \
-       $(LIBCN_CFLAGS) -I$(top_srcdir)/src/libcnrun
+       $(LIBCN_CFLAGS) -I$(top_srcdir)/src
 
 bin_PROGRAMS = \
        spike2sdf hh-latency-estimator
index b5653b205f563c11d2541120327a13af7a3b1226..ee63d5097f10cd5864cf5bc082735a8309d80843 100644 (file)
 
 #include <unistd.h>
 
-#include "libcnrun/hosted-neurons.hh"
-#include "libcnrun/standalone-synapses.hh"
+#include "libcnrun/units/hosted-neurons.hh"
+#include "libcnrun/units/standalone-synapses.hh"
 
-#include "libcnrun/model.hh"
-#include "libcnrun/types.hh"
+#include "libcnrun/model/model.hh"
+#include "libcnrun/units/types.hh"
 
 using namespace cnrun;