From f98898b25a5911bc216f0aee99e11b953856f3a5 Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Tue, 2 Aug 2016 10:44:15 +0200
Subject: [PATCH] Various small fixes.
Not sure how this compiled in the other dev environment...
nonetheless, should be fixed.
---
miniapp/miniapp_recipes.cpp | 2 +-
src/cell_group.hpp | 2 +-
src/util/ioutil.hpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/miniapp/miniapp_recipes.cpp b/miniapp/miniapp_recipes.cpp
index c7aefed2..8de187b9 100644
--- a/miniapp/miniapp_recipes.cpp
+++ b/miniapp/miniapp_recipes.cpp
@@ -56,7 +56,7 @@ public:
- param_.min_connection_delay_ms};
}
- cell_size_type num_cells() const { return ncell_; }
+ cell_size_type num_cells() const override { return ncell_; }
cell get_cell(cell_gid_type i) const override {
auto gen = std::mt19937(i); // replace this with hashing generator...
diff --git a/src/cell_group.hpp b/src/cell_group.hpp
index f72d14b2..14ea3946 100644
--- a/src/cell_group.hpp
+++ b/src/cell_group.hpp
@@ -52,7 +52,7 @@ public:
void reset() {
remove_samplers();
initialize_cells();
- for (auto& spike_source: spike_sources) {
+ for (auto& spike_source: spike_sources_) {
spike_source.source.reset(cell_, 0.f);
}
}
diff --git a/src/util/ioutil.hpp b/src/util/ioutil.hpp
index 89fb70dc..ff000a47 100644
--- a/src/util/ioutil.hpp
+++ b/src/util/ioutil.hpp
@@ -39,11 +39,11 @@ public:
virtual ~basic_null_streambuf() {}
protected:
- virtual std::streamsize xsputn(const char_type *s,std::streamsize count) {
+ std::streamsize xsputn(const char_type *s,std::streamsize count) override {
return count;
}
- virtual int_type overflow(char c) {
+ int_type overflow(int_type c) override {
return traits_type::not_eof(c);
}
};
--
GitLab