[med-svn] [cnrun] 06/14: complete commit 3e2d0528999

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit 4d8f30636ecb9301f403bad6ed8769c1c3cf961e
Author: andrei zavada <johnhommer at gmail.com>
Date:   Mon Dec 8 01:26:32 2014 +0200

    complete commit 3e2d0528999
---
 upstream/src/libcnrun/integrator/base.hh   |  2 +-
 upstream/src/libcnrun/model/model.hh       | 14 +++++++-------
 upstream/src/libcnrun/model/sources.hh     |  2 +-
 upstream/src/libcnrun/units/base-unit.hh   |  4 ++--
 upstream/src/tools/Makefile.am             |  2 +-
 upstream/src/tools/hh-latency-estimator.cc |  8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/upstream/src/libcnrun/integrator/base.hh b/upstream/src/libcnrun/integrator/base.hh
index 1fe3696..669310b 100644
--- a/upstream/src/libcnrun/integrator/base.hh
+++ b/upstream/src/libcnrun/integrator/base.hh
@@ -18,7 +18,7 @@
 #endif
 
 #include "libstilton/lang.hh"
-#include "model/forward-decls.hh"
+#include "../model/forward-decls.hh"
 
 
 namespace cnrun {
diff --git a/upstream/src/libcnrun/model/model.hh b/upstream/src/libcnrun/model/model.hh
index 093a025..88c2c3f 100644
--- a/upstream/src/libcnrun/model/model.hh
+++ b/upstream/src/libcnrun/model/model.hh
@@ -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;
diff --git a/upstream/src/libcnrun/model/sources.hh b/upstream/src/libcnrun/model/sources.hh
index 9d1b5d7..5999646 100644
--- a/upstream/src/libcnrun/model/sources.hh
+++ b/upstream/src/libcnrun/model/sources.hh
@@ -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;
diff --git a/upstream/src/libcnrun/units/base-unit.hh b/upstream/src/libcnrun/units/base-unit.hh
index cb235fb..569ce39 100644
--- a/upstream/src/libcnrun/units/base-unit.hh
+++ b/upstream/src/libcnrun/units/base-unit.hh
@@ -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;
diff --git a/upstream/src/tools/Makefile.am b/upstream/src/tools/Makefile.am
index ef7815e..25ff05f 100644
--- a/upstream/src/tools/Makefile.am
+++ b/upstream/src/tools/Makefile.am
@@ -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
diff --git a/upstream/src/tools/hh-latency-estimator.cc b/upstream/src/tools/hh-latency-estimator.cc
index b5653b2..ee63d50 100644
--- a/upstream/src/tools/hh-latency-estimator.cc
+++ b/upstream/src/tools/hh-latency-estimator.cc
@@ -16,11 +16,11 @@
 
 #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;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git