[med-svn] [cnrun] 17/25: WIP

[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 c48710744d336b7bc150388d3ae158eef973be17
Author: andrei zavada <andrei.zavada at massivesolutions.eu>
Date:   Mon Sep 29 23:02:42 2014 +0300

    WIP
---
 upstream/src/libcn/hosted-neurons.hh     | 4 ++--
 upstream/src/libcn/model-nmlio.cc        | 2 +-
 upstream/src/libcn/standalone-neurons.hh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/upstream/src/libcn/hosted-neurons.hh b/upstream/src/libcn/hosted-neurons.hh
index 37029cc..af57395 100644
--- a/upstream/src/libcn/hosted-neurons.hh
+++ b/upstream/src/libcn/hosted-neurons.hh
@@ -66,7 +66,7 @@ class C_HostedConductanceBasedNeuron
         double  E( vector<double> &b) const  { return b[idx+0]; }
         double& dE( vector<double> &b)       { return b[idx+0]; }
 
-        unsigned n_spikes_in_last_dt() const;
+        size_t n_spikes_in_last_dt() const;
 
         void do_detect_spike_or_whatever();
 };
@@ -90,7 +90,7 @@ class C_HostedRateBasedNeuron
                 {}
 
     public:
-        unsigned n_spikes_in_last_dt() const;
+        size_t n_spikes_in_last_dt() const;
 };
 
 
diff --git a/upstream/src/libcn/model-nmlio.cc b/upstream/src/libcn/model-nmlio.cc
index 7c6dddf..9fef2bb 100644
--- a/upstream/src/libcn/model-nmlio.cc
+++ b/upstream/src/libcn/model-nmlio.cc
@@ -338,7 +338,7 @@ _process_population_instances(
 
                         size_t total_len = xmlStrlen( group_prefix) + xmlStrlen( id_s);
                         if ( total_len >= C_BaseUnit::max_label_size ) {
-                                fprintf( stderr, "Combined label for an <instance> (\"%s%s\") exceeding %d characters near line %u\n",
+                                fprintf( stderr, "Combined label for an <instance> (\"%s%s\") exceeding %zu characters near line %d\n",
                                          group_prefix, id_s, C_BaseUnit::max_label_size, n->line);
                                 throw TNMLIOResult::biglabel;
                         }
diff --git a/upstream/src/libcn/standalone-neurons.hh b/upstream/src/libcn/standalone-neurons.hh
index ff4cbd2..7eaf700 100644
--- a/upstream/src/libcn/standalone-neurons.hh
+++ b/upstream/src/libcn/standalone-neurons.hh
@@ -69,7 +69,7 @@ class C_StandaloneConductanceBasedNeuron
         double E() const                        {  return V[0];  }
         double E( vector<double>&) const        {  return V[0];  }
 
-        unsigned n_spikes_in_last_dt() const;
+        size_t n_spikes_in_last_dt() const;
 };
 
 
@@ -86,7 +86,7 @@ class C_StandaloneRateBasedNeuron
                 {}
 
     public:
-        unsigned n_spikes_in_last_dt() const;
+        size_t n_spikes_in_last_dt() const;
 };
 
 

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