diff --git a/include/dspatch/SignalBus.h b/include/dspatch/SignalBus.h index dfd08629..8150a023 100644 --- a/include/dspatch/SignalBus.h +++ b/include/dspatch/SignalBus.h @@ -75,7 +75,7 @@ class DLLEXPORT SignalBus final inline void ClearAllValues(); - inline fast_any::fast_any_type GetType( int signalIndex ) const; + inline const fast_any::type_info& GetType( int signalIndex ) const; private: std::vector _signals; @@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( newValue ); + _signals[signalIndex].emplace( newValue ); } } @@ -150,7 +150,7 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue ) { if ( (size_t)signalIndex < _signals.size() ) { - _signals[signalIndex].emplace( std::move( newValue ) ); + _signals[signalIndex].emplace( std::move( newValue ) ); } } @@ -158,7 +158,7 @@ inline void SignalBus::SetSignal( int toSignalIndex, const fast_any::fast_any& f { if ( (size_t)toSignalIndex < _signals.size() ) { - _signals[toSignalIndex].emplace( fromSignal ); + _signals[toSignalIndex] = fromSignal; } } @@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues() } } -inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const +inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const { if ( (size_t)signalIndex < _signals.size() ) { diff --git a/subprojects/fast_any b/subprojects/fast_any index 5fa78cb4..22616a26 160000 --- a/subprojects/fast_any +++ b/subprojects/fast_any @@ -1 +1 @@ -Subproject commit 5fa78cb43d2a66338f543bc806ed450242da96d9 +Subproject commit 22616a26a132ffd48de8437d27fb8cbd6cf7a670