Skip to content

Commit 96eb30b

Browse files
authored
Merge pull request #409 from indramaniarorascore/inar_use_stdvariant
analysis/tracing: Use std::variant instead of score::cpp::variant
2 parents 82f9402 + b118ab1 commit 96eb30b

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

score/analysis/tracing/generic_trace_library/interface_types/generic_trace_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class GenericTraceAPI
141141
/// kRingBufferFullRecoverable, kRingBufferNoEmptyElementRecoverable, kRingBufferNoReadyElementRecoverable,
142142
/// kClientNotFoundRecoverable) in case where trace operation was not successful
143143
static TraceResult Trace(const TraceClientId client,
144-
const MetaInfoVariants::Type& meta_info,
144+
const MetaInfoVariants::StdType& meta_info,
145145
ShmDataChunkList& data,
146146
TraceContextId context_id);
147147

@@ -161,7 +161,7 @@ class GenericTraceAPI
161161
/// kRingBufferFullRecoverable, kRingBufferNoEmptyElementRecoverable, kRingBufferNoReadyElementRecoverable,
162162
/// kClientNotFoundRecoverable) in case where trace operation was not successful
163163
static TraceResult Trace(const TraceClientId client,
164-
const MetaInfoVariants::Type& meta_info,
164+
const MetaInfoVariants::StdType& meta_info,
165165
LocalDataChunkList& data) noexcept;
166166

167167
private:

score/analysis/tracing/generic_trace_library/interface_types/i_trace_library.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ class ITraceLibrary
4141
virtual RegisterTraceDoneCallBackResult RegisterTraceDoneCB(const TraceClientId trace_client_id,
4242
TraceDoneCallBackType trace_done_callback) = 0;
4343
virtual TraceResult Trace(const TraceClientId trace_client_id,
44-
const MetaInfoVariants::Type& meta_info,
44+
const MetaInfoVariants::StdType& meta_info,
4545
ShmDataChunkList& data,
4646
TraceContextId context_id) = 0;
4747
virtual TraceResult Trace(const TraceClientId trace_client_id,
48-
const MetaInfoVariants::Type& meta_info,
48+
const MetaInfoVariants::StdType& meta_info,
4949
LocalDataChunkList& data) noexcept = 0;
5050
};
5151

score/analysis/tracing/generic_trace_library/mock/trace_library_mock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ class TraceLibraryMock : public ITraceLibrary
5555
MOCK_METHOD(TraceResult,
5656
Trace,
5757
(const TraceClientId client,
58-
const MetaInfoVariants::Type& meta_info,
58+
const MetaInfoVariants::StdType& meta_info,
5959
ShmDataChunkList& data,
6060
TraceContextId context_id),
6161
(override));
6262
MOCK_METHOD(TraceResult,
6363
Trace,
64-
(const TraceClientId client, const MetaInfoVariants::Type& meta_info, LocalDataChunkList& data),
64+
(const TraceClientId client, const MetaInfoVariants::StdType& meta_info, LocalDataChunkList& data),
6565
(noexcept, override));
6666
};
6767

score/analysis/tracing/generic_trace_library/stub_implementation/generic_trace_api_stub.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RegisterTraceDoneCallBackResult GenericTraceAPI::RegisterTraceDoneCB(const Trace
7070
}
7171

7272
TraceResult GenericTraceAPI::Trace(const TraceClientId client,
73-
const MetaInfoVariants::Type& meta_info,
73+
const MetaInfoVariants::StdType& meta_info,
7474
ShmDataChunkList& data,
7575
TraceContextId context_id)
7676
{
@@ -82,7 +82,7 @@ TraceResult GenericTraceAPI::Trace(const TraceClientId client,
8282
}
8383

8484
TraceResult GenericTraceAPI::Trace(const TraceClientId client,
85-
const MetaInfoVariants::Type& meta_info,
85+
const MetaInfoVariants::StdType& meta_info,
8686
LocalDataChunkList& data) noexcept
8787
{
8888
if (gMock != nullptr)

0 commit comments

Comments
 (0)