Skip to content

Commit 54ac24f

Browse files
Update fast_any
1 parent 3e965b6 commit 54ac24f

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Diff for: include/dspatch/SignalBus.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

3131
#include <dspatch/Common.h>
3232

33-
#include <fast_any/fast_any.h>
33+
#include <fast_any/any.h>
3434

3535
#include <vector>
3636

@@ -57,7 +57,7 @@ class DLLEXPORT SignalBus final
5757
inline void SetSignalCount( int signalCount );
5858
inline int GetSignalCount() const;
5959

60-
inline fast_any::fast_any* GetSignal( int signalIndex );
60+
inline fast_any::any* GetSignal( int signalIndex );
6161

6262
inline bool HasValue( int signalIndex ) const;
6363

@@ -70,15 +70,15 @@ class DLLEXPORT SignalBus final
7070
template <typename ValueType>
7171
inline void MoveValue( int signalIndex, ValueType&& newValue );
7272

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 );
7575

7676
inline void ClearAllValues();
7777

78-
inline fast_any::fast_any_type GetType( int signalIndex ) const;
78+
inline const fast_any::type_info& GetType( int signalIndex ) const;
7979

8080
private:
81-
std::vector<fast_any::fast_any> _signals;
81+
std::vector<fast_any::any> _signals;
8282
};
8383

8484
inline SignalBus::SignalBus() = default;
@@ -99,7 +99,7 @@ inline int SignalBus::GetSignalCount() const
9999
return (int)_signals.size();
100100
}
101101

102-
inline fast_any::fast_any* SignalBus::GetSignal( int signalIndex )
102+
inline fast_any::any* SignalBus::GetSignal( int signalIndex )
103103
{
104104
if ( (size_t)signalIndex < _signals.size() )
105105
{
@@ -141,7 +141,7 @@ inline void SignalBus::SetValue( int signalIndex, const ValueType& newValue )
141141
{
142142
if ( (size_t)signalIndex < _signals.size() )
143143
{
144-
_signals[signalIndex].emplace( newValue );
144+
_signals[signalIndex].emplace<ValueType>( newValue );
145145
}
146146
}
147147

@@ -150,19 +150,19 @@ inline void SignalBus::MoveValue( int signalIndex, ValueType&& newValue )
150150
{
151151
if ( (size_t)signalIndex < _signals.size() )
152152
{
153-
_signals[signalIndex].emplace( std::move( newValue ) );
153+
_signals[signalIndex].emplace<ValueType>( std::move( newValue ) );
154154
}
155155
}
156156

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 )
158158
{
159159
if ( (size_t)toSignalIndex < _signals.size() )
160160
{
161-
_signals[toSignalIndex].emplace( fromSignal );
161+
_signals[toSignalIndex] = fromSignal;
162162
}
163163
}
164164

165-
inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::fast_any& fromSignal )
165+
inline void SignalBus::MoveSignal( int toSignalIndex, fast_any::any& fromSignal )
166166
{
167167
if ( (size_t)toSignalIndex < _signals.size() )
168168
{
@@ -178,7 +178,7 @@ inline void SignalBus::ClearAllValues()
178178
}
179179
}
180180

181-
inline fast_any::fast_any_type SignalBus::GetType( int signalIndex ) const
181+
inline const fast_any::type_info& SignalBus::GetType( int signalIndex ) const
182182
{
183183
if ( (size_t)signalIndex < _signals.size() )
184184
{

Diff for: subprojects/fast_any

0 commit comments

Comments
 (0)