@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30
30
31
31
#include < dspatch/Common.h>
32
32
33
- #include < fast_any/fast_any .h>
33
+ #include < fast_any/any .h>
34
34
35
35
#include < vector>
36
36
@@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final
57
57
inline void SetSignalCount ( int signalCount );
58
58
inline int GetSignalCount () const ;
59
59
60
- inline fast_any::fast_any * GetSignal ( int signalIndex );
60
+ inline fast_any::any * GetSignal ( int signalIndex );
61
61
62
62
inline bool HasValue ( int signalIndex ) const ;
63
63
@@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final
70
70
template <typename ValueType>
71
71
inline void MoveValue ( int signalIndex, ValueType&& newValue );
72
72
73
- inline void SetSignal ( int toSignalIndex, const fast_any::fast_any & fromSignal );
74
- inline void MoveSignal ( int toSignalIndex, fast_any::fast_any & fromSignal );
73
+ inline void SetSignal ( int toSignalIndex, const fast_any::any & fromSignal );
74
+ inline void MoveSignal ( int toSignalIndex, fast_any::any & fromSignal );
75
75
76
76
inline void ClearAllValues ();
77
77
78
- inline fast_any::fast_any_type GetType ( int signalIndex ) const ;
78
+ inline const fast_any::type_info& GetType ( int signalIndex ) const ;
79
79
80
80
private:
81
- std::vector<fast_any::fast_any > _signals;
81
+ std::vector<fast_any::any > _signals;
82
82
};
83
83
84
84
inline SignalBus::SignalBus () = default;
@@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const
99
99
return (int )_signals.size ();
100
100
}
101
101
102
- inline fast_any::fast_any * SignalBus::GetSignal ( int signalIndex )
102
+ inline fast_any::any * SignalBus::GetSignal ( int signalIndex )
103
103
{
104
104
if ( (size_t )signalIndex < _signals.size () )
105
105
{
@@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue )
141
141
{
142
142
if ( (size_t )signalIndex < _signals.size () )
143
143
{
144
- _signals[signalIndex].emplace ( newValue );
144
+ _signals[signalIndex].emplace <ValueType> ( newValue );
145
145
}
146
146
}
147
147
@@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue )
150
150
{
151
151
if ( (size_t )signalIndex < _signals.size () )
152
152
{
153
- _signals[signalIndex].emplace ( std::move ( newValue ) );
153
+ _signals[signalIndex].emplace <ValueType> ( std::move ( newValue ) );
154
154
}
155
155
}
156
156
157
- inline void SignalBus::SetSignal ( int toSignalIndex, const fast_any::fast_any & fromSignal )
157
+ inline void SignalBus::SetSignal ( int toSignalIndex, const fast_any::any & fromSignal )
158
158
{
159
159
if ( (size_t )toSignalIndex < _signals.size () )
160
160
{
161
- _signals[toSignalIndex]. emplace ( fromSignal ) ;
161
+ _signals[toSignalIndex] = fromSignal ;
162
162
}
163
163
}
164
164
165
- inline void SignalBus::MoveSignal ( int toSignalIndex, fast_any::fast_any & fromSignal )
165
+ inline void SignalBus::MoveSignal ( int toSignalIndex, fast_any::any & fromSignal )
166
166
{
167
167
if ( (size_t )toSignalIndex < _signals.size () )
168
168
{
@@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues()
178
178
}
179
179
}
180
180
181
- inline fast_any::fast_any_type SignalBus::GetType ( int signalIndex ) const
181
+ inline const fast_any::type_info& SignalBus::GetType ( int signalIndex ) const
182
182
{
183
183
if ( (size_t )signalIndex < _signals.size () )
184
184
{
0 commit comments