From 48d68e5ee0cf373956fcebbc4865cbe19542cc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20M=C3=B8rk?= Date: Mon, 9 Mar 2020 10:14:48 +0100 Subject: [PATCH 1/4] Corrected variable type --- models/music_rate_in_proxy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/music_rate_in_proxy.h b/models/music_rate_in_proxy.h index 387d1fd4d3..226826bd41 100644 --- a/models/music_rate_in_proxy.h +++ b/models/music_rate_in_proxy.h @@ -167,7 +167,7 @@ class music_rate_in_proxy : public DeviceNode struct Buffers_ { - double data_; + std::vector< double > data_; //!< The buffer for incoming data }; // ------------------------------------------------------------ From 239335b4e6249191d90011279b24b07051e087f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20M=C3=B8rk?= Date: Mon, 9 Mar 2020 10:15:03 +0100 Subject: [PATCH 2/4] Added missing include --- models/music_rate_in_proxy.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/models/music_rate_in_proxy.cpp b/models/music_rate_in_proxy.cpp index 5b65204c85..20980cc32b 100644 --- a/models/music_rate_in_proxy.cpp +++ b/models/music_rate_in_proxy.cpp @@ -37,6 +37,7 @@ // Includes from nestkernel: #include "kernel_manager.h" +#include "event_delivery_manager_impl.h" /* ---------------------------------------------------------------- * Default constructors defining default parameters and state From 064970cf4511a6517c376f2516a0ca51630920c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20M=C3=B8rk?= Date: Mon, 9 Mar 2020 14:51:21 +0100 Subject: [PATCH 3/4] Using a more minimal change Based on review by @heplesser --- models/music_rate_in_proxy.cpp | 2 +- models/music_rate_in_proxy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/music_rate_in_proxy.cpp b/models/music_rate_in_proxy.cpp index 20980cc32b..34a906d734 100644 --- a/models/music_rate_in_proxy.cpp +++ b/models/music_rate_in_proxy.cpp @@ -150,7 +150,7 @@ nest::music_rate_in_proxy::get_status( DictionaryDatum& d ) const P_.get( d ); S_.get( d ); - ( *d )[ names::data ] = DoubleVectorDatum( new std::vector< double >( B_.data_ ) ); + ( *d )[ names::data ] = DoubleVectorDatum( new std::vector< double >(1, B_.data_ ) ); } void diff --git a/models/music_rate_in_proxy.h b/models/music_rate_in_proxy.h index 226826bd41..387d1fd4d3 100644 --- a/models/music_rate_in_proxy.h +++ b/models/music_rate_in_proxy.h @@ -167,7 +167,7 @@ class music_rate_in_proxy : public DeviceNode struct Buffers_ { - std::vector< double > data_; //!< The buffer for incoming data + double data_; }; // ------------------------------------------------------------ From ceaaf63631aa5ebeb0ce06bd05efedb62a7b76fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20M=C3=B8rk?= Date: Mon, 9 Mar 2020 14:55:34 +0100 Subject: [PATCH 4/4] Formatting --- models/music_rate_in_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/music_rate_in_proxy.cpp b/models/music_rate_in_proxy.cpp index 34a906d734..f08f8f387e 100644 --- a/models/music_rate_in_proxy.cpp +++ b/models/music_rate_in_proxy.cpp @@ -150,7 +150,7 @@ nest::music_rate_in_proxy::get_status( DictionaryDatum& d ) const P_.get( d ); S_.get( d ); - ( *d )[ names::data ] = DoubleVectorDatum( new std::vector< double >(1, B_.data_ ) ); + ( *d )[ names::data ] = DoubleVectorDatum( new std::vector< double >( 1, B_.data_ ) ); } void