Skip to content

replaced score::cpp with std #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
marwan275 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

replaced score::cpp with std #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,12 @@ analysis::tracing::ServiceInstanceElement TracingRuntime::ConvertToTracingServic
if (service_element_type == impl::ServiceElementType::EVENT)
{
const auto lola_event_id = lola_service_type_deployment->events_.at(std::string{service_element_name});
output_service_instance_element.element_id = static_cast<ServiceInstanceElement::EventIdType>(lola_event_id);
output_service_instance_element.element_id = ServiceInstanceElement::EventIdType{lola_event_id};
}
else if (service_element_type == impl::ServiceElementType::FIELD)
{
const auto lola_field_id = lola_service_type_deployment->fields_.at(std::string{service_element_name});
output_service_instance_element.element_id = static_cast<ServiceInstanceElement::FieldIdType>(lola_field_id);
output_service_instance_element.element_id = ServiceInstanceElement::FieldIdType{lola_field_id};
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,13 +1035,13 @@ TEST_F(TracingRuntimeConvertToTracingServiceInstanceElementFixture,
major_version_number_,
minor_version_number_,
static_cast<ServiceInstanceElement::InstanceIdType>(instance_id_),
static_cast<ServiceInstanceElement::EventIdType>(event_id_)};
ServiceInstanceElement::EventIdType{event_id_}};
const ServiceInstanceElement expected_service_instance_element_field{
static_cast<ServiceInstanceElement::ServiceIdType>(service_id_),
major_version_number_,
minor_version_number_,
static_cast<ServiceInstanceElement::InstanceIdType>(instance_id_),
static_cast<ServiceInstanceElement::FieldIdType>(field_id_)};
ServiceInstanceElement::FieldIdType{field_id_}};

// Given a TracingRuntimeObject with a provided configuration object
TracingRuntime tracing_runtime{kNumberOfTotalConfiguredTracingSlots, configuration};
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/common_event_tracing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element
const TracingRuntime::TracePointType trace_point,
const BindingType binding_type,
const std::pair<const void*, std::size_t>& local_data_chunk,
const score::cpp::optional<TracingRuntime::TracePointDataId> trace_point_data_id) noexcept
const std::optional<TracingRuntime::TracePointDataId> trace_point_data_id) noexcept
{
auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime();
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(tracing_runtime != nullptr);
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/common_event_tracing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element
const TracingRuntime::TracePointType trace_point,
const BindingType binding_type,
const std::pair<const void*, std::size_t>& local_data_chunk = {nullptr, 0U},
const score::cpp::optional<TracingRuntime::TracePointDataId> trace_point_data_id = {}) noexcept;
const std::optional<TracingRuntime::TracePointDataId> trace_point_data_id = {}) noexcept;

ResultBlank TraceShmData(const BindingType binding_type,
const ServiceElementTracingData service_element_tracing_data,
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/common_event_tracing_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TEST_F(CommonEventTracingLocalTraceDataFixture, CallingTraceDataWillDispatchToBi
Trace(binding_type_,
service_element_instance_identifier_view_,
trace_point_,
score::cpp::optional<TracingRuntime::TracePointDataId>{trace_point_data_id_},
std::optional<TracingRuntime::TracePointDataId>{trace_point_data_id_},
local_data_chunk_.first,
local_data_chunk_.second));

Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/i_tracing_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ITracingRuntime
virtual ResultBlank Trace(const BindingType binding_type,
const ServiceElementInstanceIdentifierView service_element_instance_identifier,
const TracePointType trace_point_type,
const score::cpp::optional<TracePointDataId> trace_point_data_id,
const std::optional<TracePointDataId> trace_point_data_id,
const void* const local_data_ptr,
const std::size_t local_data_size) noexcept = 0;

Expand Down
36 changes: 18 additions & 18 deletions score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, SubscribeCallsAreTracedWhenEnabled
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
_,
_))
.WillOnce(WithArgs<4, 5>(
Expand Down Expand Up @@ -539,7 +539,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
_,
_))
.WillOnce(WithArgs<4, 5>(
Expand Down Expand Up @@ -617,7 +617,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
_,
_))
.WillOnce(WithArgs<4, 5>(
Expand Down Expand Up @@ -733,7 +733,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, UnsubscribeCallsAreTracedWhenEna
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(ResultBlank{}));
Expand Down Expand Up @@ -794,7 +794,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
Expand Down Expand Up @@ -863,7 +863,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
Expand Down Expand Up @@ -969,7 +969,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, SetReceiveHandlerCallsAreT
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(ResultBlank{}));
Expand Down Expand Up @@ -1026,7 +1026,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
Expand Down Expand Up @@ -1090,7 +1090,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
Expand Down Expand Up @@ -1198,7 +1198,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, ReceiveHandlerCallbac
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U));

Expand Down Expand Up @@ -1266,7 +1266,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
Expand Down Expand Up @@ -1342,7 +1342,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
Expand Down Expand Up @@ -1456,7 +1456,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, UnsetReceiveHandlerCalls
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U));

Expand Down Expand Up @@ -1515,7 +1515,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
Expand Down Expand Up @@ -1582,7 +1582,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
Expand Down Expand Up @@ -1689,7 +1689,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, GetNewSamplesCallsAreTracedWhe
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U));

Expand Down Expand Up @@ -1743,7 +1743,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
Expand Down Expand Up @@ -1806,7 +1806,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture,
Trace(BindingType::kLoLa,
expected_service_element_instance_identifier_view,
trace_point_type,
score::cpp::optional<tracing::ITracingRuntime::TracePointDataId>{},
std::optional<tracing::ITracingRuntime::TracePointDataId>{},
nullptr,
0U))
.WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
Expand Down
4 changes: 2 additions & 2 deletions score/mw/com/impl/tracing/tracing_runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ analysis::tracing::TracePointType InternalToExternalTracePointType(
analysis::tracing::AraComMetaInfo CreateMetaInfo(
const ServiceElementInstanceIdentifierView& service_element_instance_identifier,
const TracingRuntime::TracePointType& trace_point_type,
const score::cpp::optional<TracingRuntime::TracePointDataId> trace_point_data_id,
const std::optional<TracingRuntime::TracePointDataId> trace_point_data_id,
const IBindingTracingRuntime& binding_runtime) noexcept
{
const analysis::tracing::TracePointType ext_trace_point_type = InternalToExternalTracePointType(trace_point_type);
Expand Down Expand Up @@ -602,7 +602,7 @@ ResultBlank TracingRuntime::Trace(const BindingType binding_type,
ResultBlank TracingRuntime::Trace(const BindingType binding_type,
const ServiceElementInstanceIdentifierView service_element_instance_identifier,
const TracePointType trace_point_type,
const score::cpp::optional<TracePointDataId> trace_point_data_id,
const std::optional<TracePointDataId> trace_point_data_id,
const void* const local_data_ptr,
const std::size_t local_data_size) noexcept
{
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/tracing_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class TracingRuntime : public ITracingRuntime
ResultBlank Trace(const BindingType binding_type,
const ServiceElementInstanceIdentifierView service_element_instance_identifier,
const TracePointType trace_point_type,
const score::cpp::optional<TracePointDataId> trace_point_data_id,
const std::optional<TracePointDataId> trace_point_data_id,
const void* const local_data_ptr,
const std::size_t local_data_size) noexcept override;

Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/tracing_runtime_mock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TracingRuntimeMock : public ITracingRuntime
(BindingType,
ServiceElementInstanceIdentifierView,
TracePointType,
score::cpp::optional<TracePointDataId>,
std::optional<TracePointDataId>,
const void*,
std::size_t),
(noexcept, override));
Expand Down
2 changes: 1 addition & 1 deletion score/mw/com/impl/tracing/tracing_runtime_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ TEST(TracingRuntime, TracingRuntimeTraceWillReceivePointerToConstShmData)
score::mw::com::impl::tracing::TracingRuntime::*)(BindingType,
ServiceElementInstanceIdentifierView,
ITracingRuntime::TracePointType,
score::cpp::optional<ITracingRuntime::TracePointDataId>,
std::optional<ITracingRuntime::TracePointDataId>,
ShmPointerType,
std::size_t)>(&TracingRuntime::Trace);
static_assert(std::is_member_function_pointer_v<decltype(trace_shm_signature)>,
Expand Down
Loading
Loading