diff --git a/score/mw/com/example/ipc_bridge/BUILD b/score/mw/com/example/ipc_bridge/BUILD index 3e034d656..e2c5cee4b 100644 --- a/score/mw/com/example/ipc_bridge/BUILD +++ b/score/mw/com/example/ipc_bridge/BUILD @@ -61,7 +61,6 @@ cc_library( features = COMPILER_WARNING_FEATURES, deps = [ "//score/mw/com", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/example/ipc_bridge/main.cpp b/score/mw/com/example/ipc_bridge/main.cpp index 24e2d8a6f..a4d17a7f8 100644 --- a/score/mw/com/example/ipc_bridge/main.cpp +++ b/score/mw/com/example/ipc_bridge/main.cpp @@ -24,19 +24,19 @@ using namespace std::chrono_literals; struct Params { - score::cpp::optional mode; - score::cpp::optional instance_manifest; - score::cpp::optional cycle_time; - score::cpp::optional cycle_num; + std::optional mode; + std::optional instance_manifest; + std::optional cycle_time; + std::optional cycle_num; bool check_sample_hash; }; template -score::cpp::optional GetValueIfProvided(const boost::program_options::variables_map& args, +std::optional GetValueIfProvided(const boost::program_options::variables_map& args, std::string arg_string) { return (args.count(arg_string) > 0U) ? static_cast(args[arg_string].as()) - : score::cpp::optional(); + : std::optional(); } Params ParseCommandLineArguments(const int argc, const char** argv) diff --git a/score/mw/com/example/ipc_bridge/sample_sender_receiver.cpp b/score/mw/com/example/ipc_bridge/sample_sender_receiver.cpp index ce73b3f0f..0c11136b7 100644 --- a/score/mw/com/example/ipc_bridge/sample_sender_receiver.cpp +++ b/score/mw/com/example/ipc_bridge/sample_sender_receiver.cpp @@ -20,11 +20,11 @@ #include "score/mw/com/impl/proxy_event.h" #include #include -#include #include #include #include +#include #include #include #include @@ -145,18 +145,18 @@ class SampleReceiver } const score::mw::com::InstanceSpecifier& instance_specifier_; - score::cpp::optional last_received_; + std::optional last_received_; std::size_t received_; bool check_sample_hash_; }; -score::cpp::optional>> GetMapApiLanesStampedProxyEvent( +std::optional>> GetMapApiLanesStampedProxyEvent( IpcBridgeProxy& proxy) { return proxy.map_api_lanes_stamped_; } -score::cpp::optional> GetMapApiLanesStampedProxyEvent( +std::optional> GetMapApiLanesStampedProxyEvent( GenericProxy& generic_proxy) { const std::string event_name{"map_api_lanes_stamped"}; @@ -273,7 +273,7 @@ Result> PrepareMapLaneSample(IpcBridgeSke template int EventSenderReceiver::RunAsProxy(const score::mw::com::InstanceSpecifier& instance_specifier, - const score::cpp::optional cycle_time, + const std::optional cycle_time, const std::size_t num_cycles, bool try_writing_to_data_segment, bool check_sample_hash) @@ -331,7 +331,7 @@ int EventSenderReceiver::RunAsProxy(const score::mw::com::InstanceSpecifier& ins return EXIT_FAILURE; } - score::cpp::optional last_received{}; + std::optional last_received{}; SampleReceiver receiver{instance_specifier, check_sample_hash}; for (std::size_t cycle = 0U; cycle < num_cycles;) { @@ -466,13 +466,13 @@ int EventSenderReceiver::RunAsSkeleton(const score::mw::com::InstanceSpecifier& template int EventSenderReceiver::RunAsProxy>( const score::mw::com::InstanceSpecifier&, - const score::cpp::optional, + const std::optional, const std::size_t, bool, bool); template int EventSenderReceiver::RunAsProxy( const score::mw::com::InstanceSpecifier&, - const score::cpp::optional, + const std::optional, const std::size_t, bool, bool); diff --git a/score/mw/com/example/ipc_bridge/sample_sender_receiver.h b/score/mw/com/example/ipc_bridge/sample_sender_receiver.h index 541ad6dec..2713e0581 100644 --- a/score/mw/com/example/ipc_bridge/sample_sender_receiver.h +++ b/score/mw/com/example/ipc_bridge/sample_sender_receiver.h @@ -15,7 +15,7 @@ #include "datatype.h" -#include +#include #include #include @@ -36,7 +36,7 @@ class EventSenderReceiver template > int RunAsProxy(const score::mw::com::InstanceSpecifier& instance_specifier, - const score::cpp::optional cycle_time, + const std::optional cycle_time, const std::size_t num_cycles, bool try_writing_to_data_segment = false, bool check_sample_hash = true); diff --git a/score/mw/com/impl/BUILD b/score/mw/com/impl/BUILD index 1f78b91aa..ac2a80661 100644 --- a/score/mw/com/impl/BUILD +++ b/score/mw/com/impl/BUILD @@ -229,7 +229,6 @@ cc_library( ":skeleton_event_binding", "//score/mw/com/impl/tracing:skeleton_event_tracing", "//score/mw/com/impl/tracing:skeleton_event_tracing_data", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", ], ) @@ -246,7 +245,6 @@ cc_library( deps = [ ":error", ":skeleton_event_base", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", "@score_logging//score/mw/log", ], @@ -434,7 +432,6 @@ cc_library( ], deps = [ "proxy_event_binding", - "@score_baselibs//score/language/futurecpp", ], ) @@ -901,7 +898,6 @@ cc_gtest_unit_test( srcs = ["sample_reference_tracker_test.cpp"], deps = [ ":sample_reference_tracker", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/impl/bindings/lola/BUILD b/score/mw/com/impl/bindings/lola/BUILD index 731dddd39..e9bbdf049 100644 --- a/score/mw/com/impl/bindings/lola/BUILD +++ b/score/mw/com/impl/bindings/lola/BUILD @@ -30,7 +30,6 @@ cc_library( ":skeleton", "//score/mw/com/impl/configuration", "@score_baselibs//score/concurrency", - "@score_baselibs//score/language/futurecpp", "@score_logging//score/mw/log", ], ) @@ -99,7 +98,6 @@ cc_library( deps = [ ":proxy_instance_identifier", "//score/mw/com/impl/configuration", - "@score_baselibs//score/language/futurecpp", ], ) @@ -114,7 +112,6 @@ cc_library( ], deps = [ "//score/mw/com/impl/configuration", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp b/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp index f124db121..97c4b585b 100644 --- a/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp +++ b/score/mw/com/impl/bindings/lola/event_data_control_composite.cpp @@ -49,7 +49,7 @@ auto EventDataControlCompositeImpl::GetNextFreeMultiSlot() -> ControlSlotCompositeIndicator { EventSlotStatus::EventTimeStamp oldest_time_stamp{EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX}; - score::cpp::optional possible_index{}; + std::optional possible_index{}; EventDataControl::EventControlSlots::iterator qm_slot_ptr{nullptr}; EventDataControl::EventControlSlots::iterator asil_b_slot_ptr{nullptr}; diff --git a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp index 6c70c8131..749f9a723 100644 --- a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp +++ b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.cpp @@ -24,7 +24,7 @@ EventDataControlCompositeAttorney::EventDataControlCompositeAttorney( } void EventDataControlCompositeAttorney::PrepareAllocateNextSlot( - const std::pair, bool> expected_result) noexcept + const std::pair, bool> expected_result) noexcept { event_data_control_composite_.ignore_qm_control_ = expected_result.second; const auto slot_index = @@ -61,14 +61,14 @@ void EventDataControlCompositeAttorney::SetQmControlDisconnected(const bool expe event_data_control_composite_.ignore_qm_control_ = expected_result; } -std::pair> EventDataControlCompositeAttorney::GetSlotStatus( +std::pair> EventDataControlCompositeAttorney::GetSlotStatus( const SlotIndexType slot_index) const noexcept { return {EventSlotStatus(event_data_control_composite_.asil_qm_control_->state_slots_[slot_index]), event_data_control_composite_.asil_b_control_ != nullptr - ? score::cpp::optional( + ? std::optional( event_data_control_composite_.asil_b_control_->state_slots_[slot_index]) - : score::cpp::optional{}}; + : std::optional{}}; } EventDataControlAttorney::EventDataControlAttorney(EventDataControl& event_data_control) noexcept @@ -77,7 +77,7 @@ EventDataControlAttorney::EventDataControlAttorney(EventDataControl& event_data_ } void EventDataControlAttorney::PrepareAllocateNextSlot( - const score::cpp::optional expected_result) noexcept + const std::optional expected_result) noexcept { const auto slot_index = expected_result.has_value() ? expected_result.value() : std::numeric_limits::max(); @@ -102,7 +102,7 @@ void EventDataControlAttorney::PrepareAllocateNextSlot( } } -void EventDataControlAttorney::PrepareReferenceNextEvent(const score::cpp::optional expected_result, +void EventDataControlAttorney::PrepareReferenceNextEvent(const std::optional expected_result, const EventSlotStatus::EventTimeStamp last_search_time, const EventSlotStatus::EventTimeStamp upper_limit) noexcept { diff --git a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h index c8b9c5d21..08dc318a9 100644 --- a/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h +++ b/score/mw/com/impl/bindings/lola/event_data_control_test_resources.h @@ -16,7 +16,7 @@ #include "score/mw/com/impl/bindings/lola/event_data_control.h" #include "score/mw/com/impl/bindings/lola/event_data_control_composite.h" -#include +#include namespace score::mw::com::impl::lola { @@ -29,7 +29,7 @@ class EventDataControlCompositeAttorney /// \brief Prepares the underlying EventDataControlComposite (its contained EventDataControls) in a way, that the /// next call to AllocateNextSlot() will return the given expected_result /// \param expected_result to be expected result for AllocateNextSlot() - void PrepareAllocateNextSlot(const std::pair, bool> expected_result) noexcept; + void PrepareAllocateNextSlot(const std::pair, bool> expected_result) noexcept; /// \brief Prepares the underlying EventDataControlComposite in way, that it returns the expected_result in the next /// call to IsQmControlDisconnected() /// \param expected_result to be expected result for IsQmControlDisconnected() @@ -38,7 +38,7 @@ class EventDataControlCompositeAttorney /// \param slot_index index for which the EventSlotStatus shall be returned /// \return a pair, where first contains the EventSlotStatus of qm control and second (optionally) the /// EventSlotStatus of the asil_b control. - std::pair> GetSlotStatus( + std::pair> GetSlotStatus( const SlotIndexType slot_index) const noexcept; private: @@ -53,7 +53,7 @@ class EventDataControlAttorney /// \brief Prepares the underlying EventDataControl in a way, that the /// next call to AllocateNextSlot() will return the given expected_result /// \param expected_result to be expected result for AllocateNextSlot() - void PrepareAllocateNextSlot(const score::cpp::optional expected_result) noexcept; + void PrepareAllocateNextSlot(const std::optional expected_result) noexcept; /// \brief Prepares the underlying EventDataControl in a way, that the next call to ReferenceNextEvent() will return /// the given expected_result. @@ -64,7 +64,7 @@ class EventDataControlAttorney /// \param expected_result to be expected result for ReferenceNextEvent() /// \param last_search_time see ReferenceNextEvent() /// \param upper_limit see ReferenceNextEvent() - void PrepareReferenceNextEvent(const score::cpp::optional expected_result, + void PrepareReferenceNextEvent(const std::optional expected_result, const EventSlotStatus::EventTimeStamp last_search_time, const EventSlotStatus::EventTimeStamp upper_limit = EventSlotStatus::TIMESTSCORE_LANGUAGE_FUTURECPP_MAX) noexcept; diff --git a/score/mw/com/impl/bindings/lola/proxy_event.h b/score/mw/com/impl/bindings/lola/proxy_event.h index 85b612061..b708dd9ad 100644 --- a/score/mw/com/impl/bindings/lola/proxy_event.h +++ b/score/mw/com/impl/bindings/lola/proxy_event.h @@ -24,13 +24,13 @@ #include "score/result/result.h" #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp index 8a826c494..14a9eb47e 100644 --- a/score/mw/com/impl/bindings/lola/proxy_event_common.cpp +++ b/score/mw/com/impl/bindings/lola/proxy_event_common.cpp @@ -120,7 +120,7 @@ std::optional ProxyEventCommon::GetMaxSampleCount() const noexcep return subscription_event_state_machine_.GetMaxSampleCount(); } -score::cpp::optional ProxyEventCommon::GetTransactionLogIndex() const noexcept +std::optional ProxyEventCommon::GetTransactionLogIndex() const noexcept { return subscription_event_state_machine_.GetTransactionLogIndex(); } diff --git a/score/mw/com/impl/bindings/lola/proxy_event_common.h b/score/mw/com/impl/bindings/lola/proxy_event_common.h index 1482eba81..647f06605 100644 --- a/score/mw/com/impl/bindings/lola/proxy_event_common.h +++ b/score/mw/com/impl/bindings/lola/proxy_event_common.h @@ -26,10 +26,10 @@ #include "score/result/result.h" #include -#include #include #include +#include #include namespace score::mw::com::impl::lola @@ -91,7 +91,7 @@ class ProxyEventCommon final return event_control_; }; std::optional GetMaxSampleCount() const noexcept; - score::cpp::optional GetTransactionLogIndex() const noexcept; + std::optional GetTransactionLogIndex() const noexcept; void NotifyServiceInstanceChangedAvailability(const bool is_available, const pid_t new_event_source_pid) noexcept; private: @@ -104,7 +104,7 @@ class ProxyEventCommon final { score::cpp::ignore = test_slot_collector_.emplace(std::move(slot_collector)); }; - score::cpp::optional test_slot_collector_; + std::optional test_slot_collector_; Proxy& parent_; ElementFqId event_fq_id_; diff --git a/score/mw/com/impl/bindings/lola/proxy_method_handling_test.cpp b/score/mw/com/impl/bindings/lola/proxy_method_handling_test.cpp index d26198a0a..93d7db804 100644 --- a/score/mw/com/impl/bindings/lola/proxy_method_handling_test.cpp +++ b/score/mw/com/impl/bindings/lola/proxy_method_handling_test.cpp @@ -99,7 +99,7 @@ LolaServiceId kLolaServiceId{2U}; LolaServiceInstanceId::InstanceId kLolaInstanceId{3U}; const LolaServiceInstanceDeployment kLolaServiceInstanceDeploymentWithMethods{ - kLolaInstanceId, + LolaServiceInstanceId{kLolaInstanceId}, {}, {}, {{kDummyMethodName0, LolaMethodInstanceDeployment{kDummyQueueSize0}}, @@ -893,7 +893,7 @@ TEST_F(ProxyMethodHandlingFixture, EnablingMethodThatDoesNotContainQueueSizeInCo // empty queue size const std::optional empty_queue_size{}; const LolaServiceInstanceDeployment lola_service_instance_deployment_missing_queue_size{ - kLolaInstanceId, {}, {}, {{kDummyMethodName0, LolaMethodInstanceDeployment{empty_queue_size}}}}; + LolaServiceInstanceId{kLolaInstanceId}, {}, {}, {{kDummyMethodName0, LolaMethodInstanceDeployment{empty_queue_size}}}}; const LolaServiceTypeDeployment lola_service_type_deployment{ kLolaServiceId, {}, {}, {{kDummyMethodName0, kDummyMethodId0}}}; diff --git a/score/mw/com/impl/bindings/lola/proxy_method_test.cpp b/score/mw/com/impl/bindings/lola/proxy_method_test.cpp index 27196564d..32542a0f2 100644 --- a/score/mw/com/impl/bindings/lola/proxy_method_test.cpp +++ b/score/mw/com/impl/bindings/lola/proxy_method_test.cpp @@ -105,7 +105,7 @@ class ProxyMethodFixture : public ProxyMockedMemoryFixture make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, LolaServiceTypeDeployment{42U}, - LolaServiceInstanceDeployment{1U}}; + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}}; std::unique_ptr unit_{nullptr}; diff --git a/score/mw/com/impl/bindings/lola/proxy_test.cpp b/score/mw/com/impl/bindings/lola/proxy_test.cpp index 284ce44b1..420f6fc83 100644 --- a/score/mw/com/impl/bindings/lola/proxy_test.cpp +++ b/score/mw/com/impl/bindings/lola/proxy_test.cpp @@ -292,7 +292,7 @@ TEST_F(ProxyCreationDeathTest, CreatingProxyWithoutLolaServiceInstanceIdTerminat // Given a deployment information which contains a lola instance deployment which has no instance ID const ServiceInstanceDeployment service_instance_deployment_without_instance_id{ service, - LolaServiceInstanceDeployment{score::cpp::optional{}}, + LolaServiceInstanceDeployment{std::optional{}}, QualityType::kASIL_QM, kInstanceSpecifier}; const auto identifier = diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.cpp index f236d786a..07c8edfdd 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.cpp @@ -165,7 +165,7 @@ auto ServiceDiscoveryClient::OfferService(const InstanceIdentifier instance_iden } } - QualityAwareContainer> flag_files{}; + QualityAwareContainer> flag_files{}; // Suppress "AUTOSAR C++14 M6-4-3" rule finding. This rule declares: "A switch statement shall be // a well-formed switch statement". // We don't need a break statement at each case as we use fallthrough and return. diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.h b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.h index b5023c251..9e2ce2769 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.h +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client.h @@ -216,7 +216,7 @@ class ServiceDiscoveryClient final : public IServiceDiscoveryClient std::recursive_mutex worker_mutex_; concurrency::TaskResult worker_thread_result_; - std::unordered_map>> flag_files_; + std::unordered_map>> flag_files_; std::unordered_set obsolete_search_requests_; std::mutex flag_files_mutex_; }; diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_find_service_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_find_service_test.cpp index b1574c7cf..d5fe46091 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_find_service_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_find_service_test.cpp @@ -56,10 +56,10 @@ ConfigurationStore kConfigStoreFindAny{kInstanceSpecifierString, make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}}; + std::optional{}}; -HandleType kHandleFindAnyQm1{kConfigStoreFindAny.GetHandle(kConfigStoreQm1.lola_instance_id_.value())}; -HandleType kHandleFindAnyQm2{kConfigStoreFindAny.GetHandle(kConfigStoreQm2.lola_instance_id_.value())}; +HandleType kHandleFindAnyQm1{kConfigStoreFindAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm1.lola_instance_id_.value()}})}; +HandleType kHandleFindAnyQm2{kConfigStoreFindAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm2.lola_instance_id_.value()}})}; using ServiceDiscoveryClientFindServiceFixture = ServiceDiscoveryClientFixture; TEST_F(ServiceDiscoveryClientFindServiceFixture, AddsNoWatchOnFindService) @@ -110,9 +110,11 @@ TEST_F(ServiceDiscoveryClientFindServiceFixture, FindServiceReturnHandlesForAny) // whose handles contain InstanceIdentifiers without an InstanceId and explitily set InstanceIds in the handles // themselves const auto expected_handle_0 = - make_HandleType(kConfigStoreFindAny.GetInstanceIdentifier(), kConfigStoreQm1.lola_instance_id_.value()); + make_HandleType(kConfigStoreFindAny.GetInstanceIdentifier(), + ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm1.lola_instance_id_.value()}}); const auto expected_handle_1 = - make_HandleType(kConfigStoreFindAny.GetInstanceIdentifier(), kConfigStoreQm2.lola_instance_id_.value()); + make_HandleType(kConfigStoreFindAny.GetInstanceIdentifier(), + ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm2.lola_instance_id_.value()}}); EXPECT_THAT(service_handle_container, Contains(expected_handle_0)); EXPECT_THAT(service_handle_container, Contains(expected_handle_1)); } diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_sequence_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_sequence_test.cpp index 705c93bc3..740c1fb1f 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_sequence_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_sequence_test.cpp @@ -54,7 +54,7 @@ ConfigurationStore kConfigStoreFindAny{kInstanceSpecifierString, make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}}; + std::optional{}}; HandleType kHandleQm1{kConfigStoreQm1.GetHandle()}; HandleType kHandleQm2{kConfigStoreQm2.GetHandle()}; diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_start_find_service_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_start_find_service_test.cpp index 9978ca2ae..f5dbf69ff 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_start_find_service_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_start_find_service_test.cpp @@ -78,11 +78,11 @@ ConfigurationStore kConfigStoreFindAny{kInstanceSpecifierString, make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}}; + std::optional{}}; -HandleType kHandleFindAnyQm1{kConfigStoreFindAny.GetHandle(kConfigStoreQm1.lola_instance_id_.value())}; -HandleType kHandleFindAnyQm2{kConfigStoreFindAny.GetHandle(kConfigStoreQm2.lola_instance_id_.value())}; -HandleType kHandleFindAnyAsilB{kConfigStoreFindAny.GetHandle(kConfigStoreAsilB.lola_instance_id_.value())}; +HandleType kHandleFindAnyQm1{kConfigStoreFindAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm1.lola_instance_id_.value()}})}; +HandleType kHandleFindAnyQm2{kConfigStoreFindAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kConfigStoreQm2.lola_instance_id_.value()}})}; +HandleType kHandleFindAnyAsilB{kConfigStoreFindAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kConfigStoreAsilB.lola_instance_id_.value()}})}; using ServiceDiscoveryClientStartFindServiceFixture = ServiceDiscoveryClientFixture; TEST_F(ServiceDiscoveryClientStartFindServiceFixture, CallingStartFindServiceReturnsValidResult) diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_stop_find_service_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_stop_find_service_test.cpp index 0a27b01c9..a7de54c65 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_stop_find_service_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_stop_find_service_test.cpp @@ -68,7 +68,7 @@ ConfigurationStore kConfigStoreFindAny{kInstanceSpecifierString, make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}}; + std::optional{}}; using ServiceDiscoveryClientStopFindServiceFixture = ServiceDiscoveryClientFixture; TEST_F(ServiceDiscoveryClientStopFindServiceFixture, RemovesWatchOnStopFindService) @@ -175,7 +175,7 @@ TEST_F(ServiceDiscoveryClientStopFindServiceFixture, CanCallStopFindServiceInsid EXPECT_CALL(find_service_handler, Call(_, expected_handle)) .WillOnce(Invoke([this](auto container, auto find_service_handle) { EXPECT_EQ(container.size(), 1); - EXPECT_EQ(container[0], kConfigStoreFindAny.GetHandle(kConfigStoreQm1.lola_instance_id_.value())); + EXPECT_EQ(container[0], kConfigStoreFindAny.GetHandle(ServiceInstanceId{kConfigStoreQm1.lola_instance_id_.value()})); const auto result = service_discovery_client_->StopFindService(find_service_handle); ASSERT_TRUE(result.has_value()); diff --git a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_worker_thread_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_worker_thread_test.cpp index f390b773c..c5b4dafea 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_worker_thread_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/client/service_discovery_client_worker_thread_test.cpp @@ -71,7 +71,7 @@ ConfigurationStore kConfigStoreFindAny{kInstanceSpecifierString, make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}}; + std::optional{}}; score::cpp::static_vector CreateEventVectorWithEventMasks( const std::vector& event_masks, diff --git a/score/mw/com/impl/bindings/lola/service_discovery/flag_file_crawler_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/flag_file_crawler_test.cpp index 8a4bc0f54..70a7ae847 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/flag_file_crawler_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/flag_file_crawler_test.cpp @@ -89,7 +89,7 @@ const ConfigurationStore kConfigStoreQmAny{ kServiceIdentifier, QualityType::kASIL_QM, kServiceId, - score::cpp::optional{}, + std::optional{}, }; const ConfigurationStore kConfigStoreAsilBAny{ @@ -97,7 +97,7 @@ const ConfigurationStore kConfigStoreAsilBAny{ kServiceIdentifier, QualityType::kASIL_B, kServiceId, - score::cpp::optional{}, + std::optional{}, }; const ConfigurationStore kConfigStoreInvalidQualityAny{ @@ -105,7 +105,7 @@ const ConfigurationStore kConfigStoreInvalidQualityAny{ kServiceIdentifier, QualityType::kInvalid, kServiceId, - score::cpp::optional{}, + std::optional{}, }; EnrichedInstanceIdentifier kEnrichedInstanceIdentifier1Invalid{kConfigStoreQm1.GetEnrichedInstanceIdentifier(), @@ -297,16 +297,16 @@ TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, const auto asil_qm_handles = existing_instances_result.value().asil_qm.GetKnownHandles(searched_instance.GetEnrichedInstanceIdentifier()); ASSERT_EQ(asil_qm_handles.size(), 2U); - EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(kInstanceId1))); - EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(kInstanceId2))); + EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{kInstanceId1}))); + EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{kInstanceId2}))); // and the instances container will contain all the handles for instances corresponding to the searched service // with quality type ASIL-B const auto asil_b_handles = existing_instances_result.value().asil_qm.GetKnownHandles(searched_instance.GetEnrichedInstanceIdentifier()); ASSERT_EQ(asil_b_handles.size(), 2U); - EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(kInstanceId1))); - EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(kInstanceId2))); + EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{kInstanceId1}))); + EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{kInstanceId2}))); } TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, @@ -330,16 +330,16 @@ TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, const auto asil_qm_handles = existing_instances_result.value().asil_qm.GetKnownHandles(searched_instance.GetEnrichedInstanceIdentifier()); ASSERT_EQ(asil_qm_handles.size(), 2U); - EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(kInstanceId1))); - EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(kInstanceId2))); + EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId1}}))); + EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId2}}))); // and the instances container will contain all the handles for instances corresponding to the searched service // with quality type ASIL-B const auto asil_b_handles = existing_instances_result.value().asil_qm.GetKnownHandles(searched_instance.GetEnrichedInstanceIdentifier()); ASSERT_EQ(asil_b_handles.size(), 2U); - EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(kInstanceId1))); - EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(kInstanceId2))); + EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId1}}))); + EXPECT_THAT(asil_b_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId2}}))); } TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, IgnoresInvalidInstanceDirectories) @@ -365,7 +365,7 @@ TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, IgnoresInvalidInstanceDirectories const auto asil_qm_handles = existing_instances_result.value().asil_qm.GetKnownHandles(searched_instance.GetEnrichedInstanceIdentifier()); ASSERT_EQ(asil_qm_handles.size(), 1U); - EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(kInstanceId1))); + EXPECT_THAT(asil_qm_handles, Contains(searched_instance.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId1}}))); } TEST_F(FlagFileCrawlerCrawlAnyInstanceFixture, ReturnsErrorWhenGettingDirectoryStatusReturnsError) @@ -565,7 +565,7 @@ TEST_F(FlagFileCrawlerCrawlAndWatchAnyInstanceFixture, IgnoresDirectoriesInInsta EXPECT_TRUE(instances.asil_b.Empty()); const auto asil_qm_handles = instances.asil_qm.GetKnownHandles( kConfigStoreQmAny.GetEnrichedInstanceIdentifier(ServiceInstanceId{kInstanceId1})); - EXPECT_THAT(asil_qm_handles, Contains(kConfigStoreQmAny.GetHandle(kInstanceId1))); + EXPECT_THAT(asil_qm_handles, Contains(kConfigStoreQmAny.GetHandle(ServiceInstanceId{LolaServiceInstanceId{kInstanceId1}}))); } TEST_F(FlagFileCrawlerCrawlAndWatchSpecificInstanceFixture, IgnoresFilesOnInstanceIdDirectoryLevel) diff --git a/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container.cpp b/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container.cpp index af2f02f6f..2433f164b 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container.cpp @@ -74,7 +74,7 @@ auto KnownInstancesContainer::GetKnownHandles( if (known_service_instances.find(handle_instance_id.value()) != known_service_instances.cend()) { handles.push_back(make_HandleType(enriched_instance_identifier.GetInstanceIdentifier(), - LolaServiceInstanceId{handle_instance_id.value()})); + ServiceInstanceId{LolaServiceInstanceId{handle_instance_id.value()}})); } } else @@ -82,7 +82,7 @@ auto KnownInstancesContainer::GetKnownHandles( for (const auto& instance_id : known_service_instances) { handles.push_back(make_HandleType(enriched_instance_identifier.GetInstanceIdentifier(), - LolaServiceInstanceId{instance_id})); + ServiceInstanceId{LolaServiceInstanceId{instance_id}})); } } diff --git a/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container_test.cpp b/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container_test.cpp index 99a30ae19..6fa340bb2 100644 --- a/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container_test.cpp +++ b/score/mw/com/impl/bindings/lola/service_discovery/known_instances_container_test.cpp @@ -58,9 +58,9 @@ EnrichedInstanceIdentifier kEnrichedInstanceIdentifier3{kInstanceIdentifier3}; EnrichedInstanceIdentifier kEnrichedInstanceIdentifierAny{kInstanceIdentifierAny}; HandleType kHandleType1{make_HandleType(kInstanceIdentifier1)}; HandleType kHandleType2{make_HandleType(kInstanceIdentifier2)}; -HandleType kHandleTypeAny1{make_HandleType(kInstanceIdentifierAny, kInstanceId1)}; -HandleType kHandleTypeAny2{make_HandleType(kInstanceIdentifierAny, kInstanceId2)}; -HandleType kHandleTypeAny3{make_HandleType(kInstanceIdentifierAny, kInstanceId3)}; +HandleType kHandleTypeAny1{make_HandleType(kInstanceIdentifierAny, ServiceInstanceId{kInstanceId1})}; +HandleType kHandleTypeAny2{make_HandleType(kInstanceIdentifierAny, ServiceInstanceId{kInstanceId2})}; +HandleType kHandleTypeAny3{make_HandleType(kInstanceIdentifierAny, ServiceInstanceId{kInstanceId3})}; class KnownInstancesContainerTest : public ::testing::Test { diff --git a/score/mw/com/impl/bindings/lola/skeleton.cpp b/score/mw/com/impl/bindings/lola/skeleton.cpp index 776aaa0c7..dda8a8b1d 100644 --- a/score/mw/com/impl/bindings/lola/skeleton.cpp +++ b/score/mw/com/impl/bindings/lola/skeleton.cpp @@ -748,7 +748,7 @@ bool Skeleton::OpenSharedMemoryForControl(const QualityType asil_level) void Skeleton::RemoveSharedMemory() { - constexpr auto RemoveMemoryIfExists = [](const score::cpp::optional& path) -> void { + constexpr auto RemoveMemoryIfExists = [](const std::optional& path) -> void { if (path.has_value()) { score::memory::shared::SharedMemoryFactory::Remove(path.value()); @@ -830,8 +830,8 @@ Skeleton::ShmResourceStorageSizes Skeleton::CalculateShmResourceStorageSizesBySi const auto control_asil_b_size = detail_skeleton::HasAsilBSupport(identifier_) - ? score::cpp::optional{control_asil_resource_->GetUserAllocatedBytes()} - : score::cpp::optional{}; + ? std::optional{control_asil_resource_->GetUserAllocatedBytes()} + : std::optional{}; return ShmResourceStorageSizes{control_data_size, control_qm_size, control_asil_b_size}; } @@ -924,12 +924,12 @@ Skeleton::ShmResourceStorageSizes Skeleton::CalculateShmResourceStorageSizes(Ske // key value is not comparable and in our case the key is comparable. so no way for 'event_controls_.find()' to throw // an exception. // coverity[autosar_cpp14_a15_5_3_violation : FALSE] -score::cpp::optional Skeleton::GetEventMetaInfo(const ElementFqId element_fq_id) const +std::optional Skeleton::GetEventMetaInfo(const ElementFqId element_fq_id) const { auto search = storage_->events_metainfo_.find(element_fq_id); if (search == storage_->events_metainfo_.cend()) { - return score::cpp::nullopt; + return std::nullopt; } else { diff --git a/score/mw/com/impl/bindings/lola/skeleton.h b/score/mw/com/impl/bindings/lola/skeleton.h index 05ceb9177..0aba7eb34 100644 --- a/score/mw/com/impl/bindings/lola/skeleton.h +++ b/score/mw/com/impl/bindings/lola/skeleton.h @@ -48,8 +48,8 @@ #include "score/memory/shared/polymorphic_offset_ptr_allocator.h" #include -#include +#include #include #include #include @@ -127,7 +127,7 @@ class Skeleton final : public SkeletonBinding /// \brief Returns the meta-info for the given registered event. /// \param element_fq_id identification of the event. /// \return Events meta-info, if it has been registered, null else. - score::cpp::optional GetEventMetaInfo(const ElementFqId element_fq_id) const; + std::optional GetEventMetaInfo(const ElementFqId element_fq_id) const; QualityType GetInstanceQualityType() const; @@ -193,7 +193,7 @@ class Skeleton final : public SkeletonBinding // coverity[autosar_cpp14_m11_0_1_violation] std::size_t control_qm_size; // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional control_asil_b_size; + std::optional control_asil_b_size; }; /// \brief Calculates needed sizes for shm-objects for data and ctrl either via simulation or a rough estimation @@ -241,9 +241,9 @@ class Skeleton final : public SkeletonBinding LolaServiceInstanceId::InstanceId lola_instance_id_; LolaServiceTypeDeployment::ServiceId lola_service_id_; - score::cpp::optional data_storage_path_; - score::cpp::optional data_control_qm_path_; - score::cpp::optional data_control_asil_path_; + std::optional data_storage_path_; + std::optional data_control_qm_path_; + std::optional data_control_asil_path_; ServiceDataStorage* storage_; ServiceDataControl* control_qm_; ServiceDataControl* control_asil_b_; diff --git a/score/mw/com/impl/bindings/lola/skeleton_event.h b/score/mw/com/impl/bindings/lola/skeleton_event.h index c0bca4719..2dc260e99 100644 --- a/score/mw/com/impl/bindings/lola/skeleton_event.h +++ b/score/mw/com/impl/bindings/lola/skeleton_event.h @@ -32,7 +32,6 @@ #include "score/mw/log/logging.h" #include -#include #include #include @@ -84,10 +83,10 @@ class SkeletonEvent final : public SkeletonEventBinding /// \brief Sends a value by _copy_ towards a consumer. It will allocate the necessary space and then copy the value /// into Shared Memory. ResultBlank Send(const SampleType& value, - score::cpp::optional send_trace_callback) noexcept override; + std::optional send_trace_callback) noexcept override; ResultBlank Send(impl::SampleAllocateePtr sample, - score::cpp::optional send_trace_callback) noexcept override; + std::optional send_trace_callback) noexcept override; Result> Allocate() noexcept override; @@ -168,7 +167,7 @@ template // std::bad_optional_access which leds to std::terminate(). // coverity[autosar_cpp14_a15_5_3_violation : FALSE] ResultBlank SkeletonEvent::Send(const SampleType& value, - score::cpp::optional send_trace_callback) noexcept + std::optional send_trace_callback) noexcept { auto allocated_slot_result = Allocate(); if (!(allocated_slot_result.has_value())) @@ -183,7 +182,7 @@ ResultBlank SkeletonEvent::Send(const SampleType& value, template ResultBlank SkeletonEvent::Send(impl::SampleAllocateePtr sample, - score::cpp::optional send_trace_callback) noexcept + std::optional send_trace_callback) noexcept { const impl::SampleAllocateePtrView view{sample}; auto ptr = view.template As>(); diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp index 8827bfa08..cf4d56050 100644 --- a/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp +++ b/score/mw/com/impl/bindings/lola/skeleton_event_test.cpp @@ -338,7 +338,7 @@ TEST_F(SkeletonEventTimestampFixture, SendUpdatesTimestampInControlData) auto* first_lola_ptr = first_view.template As>(); auto first_slot_indicator = first_lola_ptr->GetReferencedSlot(); - auto first_send_result = skeleton_event_->Send(std::move(first_allocated_slot), score::cpp::nullopt); + auto first_send_result = skeleton_event_->Send(std::move(first_allocated_slot), std::nullopt); ASSERT_TRUE(first_send_result.has_value()); // THEN its timestamp should be a valid, non-zero value @@ -355,7 +355,7 @@ TEST_F(SkeletonEventTimestampFixture, SendUpdatesTimestampInControlData) const impl::SampleAllocateePtrView second_view{second_allocated_slot}; auto* second_lola_ptr = second_view.template As>(); auto second_slot_indicator = second_lola_ptr->GetReferencedSlot(); - auto second_send_result = skeleton_event_->Send(std::move(second_allocated_slot), score::cpp::nullopt); + auto second_send_result = skeleton_event_->Send(std::move(second_allocated_slot), std::nullopt); ASSERT_TRUE(second_send_result.has_value()); // THEN its timestamp should be exactly one greater than the first one diff --git a/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp index 37011e95c..04e27e7f0 100644 --- a/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp +++ b/score/mw/com/impl/bindings/lola/skeleton_event_tracing_test.cpp @@ -23,7 +23,7 @@ #include "score/filesystem/filesystem.h" -#include +#include #include #include diff --git a/score/mw/com/impl/bindings/lola/skeleton_method_test.cpp b/score/mw/com/impl/bindings/lola/skeleton_method_test.cpp index 9354714e2..98643b18e 100644 --- a/score/mw/com/impl/bindings/lola/skeleton_method_test.cpp +++ b/score/mw/com/impl/bindings/lola/skeleton_method_test.cpp @@ -130,7 +130,7 @@ class SkeletonMethodFixture : public SkeletonMockedMemoryFixture make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, LolaServiceTypeDeployment{kDummyServiceId}, - LolaServiceInstanceDeployment{kDummyInstanceId}}; + LolaServiceInstanceDeployment{LolaServiceInstanceId{kDummyInstanceId}}}; std::unique_ptr unit_{nullptr}; diff --git a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp index 6fe960732..880802677 100644 --- a/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp +++ b/score/mw/com/impl/bindings/lola/slot_decrementer_test.cpp @@ -17,7 +17,7 @@ #include "score/mw/com/impl/bindings/lola/test_doubles/fake_memory_resource.h" #include "score/mw/com/impl/bindings/lola/transaction_log_id.h" -#include +#include #include #include @@ -71,7 +71,7 @@ class SlotDecrementerFixture : public ::testing::Test event_data_control_.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogId).value()}; ControlSlotIndicator control_slot_indicator_{}; - score::cpp::optional slot_decrementer_{}; + std::optional slot_decrementer_{}; }; TEST_F(SlotDecrementerFixture, CreatingSlotDecrementerWithReferencedSlotMaintainsReferenceCount) diff --git a/score/mw/com/impl/bindings/lola/subscription_helpers.cpp b/score/mw/com/impl/bindings/lola/subscription_helpers.cpp index 2cfac6468..c647b4d04 100644 --- a/score/mw/com/impl/bindings/lola/subscription_helpers.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_helpers.cpp @@ -56,7 +56,7 @@ void EventReceiveHandlerManager::Unregister() noexcept auto& lola_runtime = GetBindingRuntime(BindingType::kLoLa); lola_runtime.GetLolaMessaging().UnregisterEventNotification( asil_level_, element_fq_id_, registration_number_.value(), event_source_pid_); - registration_number_ = score::cpp::nullopt; + registration_number_ = std::nullopt; } } diff --git a/score/mw/com/impl/bindings/lola/subscription_helpers.h b/score/mw/com/impl/bindings/lola/subscription_helpers.h index 8b138c431..38b3f56cc 100644 --- a/score/mw/com/impl/bindings/lola/subscription_helpers.h +++ b/score/mw/com/impl/bindings/lola/subscription_helpers.h @@ -19,9 +19,9 @@ #include "score/mw/com/impl/scoped_event_receive_handler.h" #include -#include #include +#include #include namespace score::mw::com::impl::lola @@ -61,7 +61,7 @@ class EventReceiveHandlerManager const QualityType asil_level_; const ElementFqId element_fq_id_; pid_t event_source_pid_; - score::cpp::optional registration_number_; + std::optional registration_number_; }; class SubscriptionData @@ -79,9 +79,9 @@ class SubscriptionData // be private.". There are no class invariants to maintain which could be violated by directly accessing member // variables. // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional max_sample_count_; + std::optional max_sample_count_; // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional slot_collector_; + std::optional slot_collector_; }; std::string CreateLoggingString(std::string&& string, diff --git a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp index 66c33d960..d32731938 100644 --- a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.cpp @@ -133,21 +133,21 @@ std::optional NotSubscribedState::GetMaxSampleCount() const noexc return {}; } -score::cpp::optional& NotSubscribedState::GetSlotCollector() noexcept +std::optional& NotSubscribedState::GetSlotCollector() noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(!state_machine_.subscription_data_.slot_collector_.has_value(), "Slot collector should not be created until Subscribe is called."); return state_machine_.subscription_data_.slot_collector_; } -const score::cpp::optional& NotSubscribedState::GetSlotCollector() const noexcept +const std::optional& NotSubscribedState::GetSlotCollector() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(!state_machine_.subscription_data_.slot_collector_.has_value(), "Slot collector should not be created until Subscribe is called."); return state_machine_.subscription_data_.slot_collector_; } -score::cpp::optional NotSubscribedState::GetTransactionLogIndex() const noexcept +std::optional NotSubscribedState::GetTransactionLogIndex() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE( !state_machine_.transaction_log_registration_guard_.has_value(), diff --git a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h index 9c739e7ca..cf13688f7 100644 --- a/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h +++ b/score/mw/com/impl/bindings/lola/subscription_not_subscribed_states.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/bindings/lola/subscription_state_base.h" #include "score/mw/com/impl/scoped_event_receive_handler.h" -#include +#include #include #include @@ -47,9 +47,9 @@ class NotSubscribedState final : public SubscriptionStateBase void SetReceiveHandler(std::weak_ptr handler) noexcept override; void UnsetReceiveHandler() noexcept override; std::optional GetMaxSampleCount() const noexcept override; - score::cpp::optional& GetSlotCollector() noexcept override; - const score::cpp::optional& GetSlotCollector() const noexcept override; - score::cpp::optional GetTransactionLogIndex() const noexcept override; + std::optional& GetSlotCollector() noexcept override; + const std::optional& GetSlotCollector() const noexcept override; + std::optional GetTransactionLogIndex() const noexcept override; void OnEntry() noexcept override; }; diff --git a/score/mw/com/impl/bindings/lola/subscription_state_base.h b/score/mw/com/impl/bindings/lola/subscription_state_base.h index fbd46351c..123a1ae4e 100644 --- a/score/mw/com/impl/bindings/lola/subscription_state_base.h +++ b/score/mw/com/impl/bindings/lola/subscription_state_base.h @@ -23,7 +23,7 @@ #include "score/result/result.h" -#include +#include #include #include @@ -56,9 +56,9 @@ class SubscriptionStateBase virtual void SetReceiveHandler(std::weak_ptr handler) noexcept = 0; virtual void UnsetReceiveHandler() noexcept = 0; virtual std::optional GetMaxSampleCount() const noexcept = 0; - virtual score::cpp::optional& GetSlotCollector() noexcept = 0; - virtual const score::cpp::optional& GetSlotCollector() const noexcept = 0; - virtual score::cpp::optional GetTransactionLogIndex() const noexcept = 0; + virtual std::optional& GetSlotCollector() noexcept = 0; + virtual const std::optional& GetSlotCollector() const noexcept = 0; + virtual std::optional GetTransactionLogIndex() const noexcept = 0; virtual void OnEntry() noexcept {}; virtual void OnExit() noexcept {}; diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp index 57049c913..d2d12a19d 100644 --- a/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.cpp @@ -113,17 +113,17 @@ std::optional SubscriptionStateMachine::GetMaxSampleCount() const return GetCurrentEventState().GetMaxSampleCount(); } -score::cpp::optional& SubscriptionStateMachine::GetSlotCollectorLockFree() noexcept +std::optional& SubscriptionStateMachine::GetSlotCollectorLockFree() noexcept { return GetCurrentEventState().GetSlotCollector(); } -const score::cpp::optional& SubscriptionStateMachine::GetSlotCollectorLockFree() const noexcept +const std::optional& SubscriptionStateMachine::GetSlotCollectorLockFree() const noexcept { return GetCurrentEventState().GetSlotCollector(); } -score::cpp::optional SubscriptionStateMachine::GetTransactionLogIndex() +std::optional SubscriptionStateMachine::GetTransactionLogIndex() const noexcept { std::lock_guard lock{state_mutex_}; diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine.h b/score/mw/com/impl/bindings/lola/subscription_state_machine.h index a814dbc10..84038264e 100644 --- a/score/mw/com/impl/bindings/lola/subscription_state_machine.h +++ b/score/mw/com/impl/bindings/lola/subscription_state_machine.h @@ -27,12 +27,12 @@ #include "score/result/result.h" #include -#include #include #include #include #include +#include #include #include @@ -115,9 +115,9 @@ class SubscriptionStateMachine : public std::enable_shared_from_this& GetSlotCollectorLockFree() noexcept; - const score::cpp::optional& GetSlotCollectorLockFree() const noexcept; - score::cpp::optional GetTransactionLogIndex() const noexcept; + std::optional& GetSlotCollectorLockFree() noexcept; + const std::optional& GetSlotCollectorLockFree() const noexcept; + std::optional GetTransactionLogIndex() const noexcept; [[nodiscard]] const ElementFqId& GetElementFqId() const noexcept; private: @@ -143,7 +143,7 @@ class SubscriptionStateMachine : public std::enable_shared_from_this transaction_log_registration_guard_; + std::optional transaction_log_registration_guard_; // used for logging purposes const ElementFqId element_fq_id_; diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp index 96d2d426d..00f3c5e74 100644 --- a/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_state_machine_events_test.cpp @@ -76,7 +76,7 @@ class StateMachineEventsFixture : public LolaProxyEventResources EXPECT_EQ(state_machine_.GetCurrentState(), SubscriptionStateMachineState::SUBSCRIBED_STATE); } - score::cpp::optional> GetTransactionLog( + std::optional> GetTransactionLog( const TransactionLogId& transaction_log_id) noexcept { auto& transaction_log_set = proxy_->GetEventControl(element_fq_id_).data_control.GetTransactionLogSet(); diff --git a/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp b/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp index ac377b7c3..e35ee5017 100644 --- a/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_state_machine_methods_test.cpp @@ -97,7 +97,7 @@ class StateMachineMethodsFixture : public LolaProxyEventResources return event_receive_handler; } - const score::cpp::optional& GetConstSlotCollector() const + const std::optional& GetConstSlotCollector() const { return state_machine_.GetSlotCollectorLockFree(); } diff --git a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp index 9c70bc0df..12a203299 100644 --- a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.cpp @@ -91,7 +91,7 @@ std::optional SubscribedState::GetMaxSampleCount() const noexcept return state_machine_.subscription_data_.max_sample_count_.value(); } -score::cpp::optional& SubscribedState::GetSlotCollector() noexcept +std::optional& SubscribedState::GetSlotCollector() noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE( state_machine_.subscription_data_.max_sample_count_.has_value(), @@ -99,7 +99,7 @@ score::cpp::optional& SubscribedState::GetSlotCollector() noexcep return state_machine_.subscription_data_.slot_collector_; } -const score::cpp::optional& SubscribedState::GetSlotCollector() const noexcept +const std::optional& SubscribedState::GetSlotCollector() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE( state_machine_.subscription_data_.max_sample_count_.has_value(), @@ -107,7 +107,7 @@ const score::cpp::optional& SubscribedState::GetSlotCollector() c return state_machine_.subscription_data_.slot_collector_; } -score::cpp::optional SubscribedState::GetTransactionLogIndex() const noexcept +std::optional SubscribedState::GetTransactionLogIndex() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(state_machine_.transaction_log_registration_guard_.has_value(), "TransactionLogRegistrationGuard should be initialised on subscription."); diff --git a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h index a2543dc8f..601728e94 100644 --- a/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h +++ b/score/mw/com/impl/bindings/lola/subscription_subscribed_states.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/bindings/lola/subscription_state_base.h" #include "score/mw/com/impl/scoped_event_receive_handler.h" -#include +#include #include #include @@ -48,9 +48,9 @@ class SubscribedState final : public SubscriptionStateBase void SetReceiveHandler(std::weak_ptr handler) noexcept override; void UnsetReceiveHandler() noexcept override; std::optional GetMaxSampleCount() const noexcept override; - score::cpp::optional& GetSlotCollector() noexcept override; - const score::cpp::optional& GetSlotCollector() const noexcept override; - score::cpp::optional GetTransactionLogIndex() const noexcept override; + std::optional& GetSlotCollector() noexcept override; + const std::optional& GetSlotCollector() const noexcept override; + std::optional GetTransactionLogIndex() const noexcept override; }; } // namespace score::mw::com::impl::lola diff --git a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp index 55d4239f2..b4fe8f8e0 100644 --- a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp +++ b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.cpp @@ -98,7 +98,7 @@ std::optional SubscriptionPendingState::GetMaxSampleCount() const return state_machine_.subscription_data_.max_sample_count_.value(); } -score::cpp::optional& SubscriptionPendingState::GetSlotCollector() noexcept +std::optional& SubscriptionPendingState::GetSlotCollector() noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE( state_machine_.subscription_data_.max_sample_count_.has_value(), @@ -106,7 +106,7 @@ score::cpp::optional& SubscriptionPendingState::GetSlotCollector( return state_machine_.subscription_data_.slot_collector_; } -const score::cpp::optional& SubscriptionPendingState::GetSlotCollector() const noexcept +const std::optional& SubscriptionPendingState::GetSlotCollector() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE( state_machine_.subscription_data_.max_sample_count_.has_value(), @@ -114,7 +114,7 @@ const score::cpp::optional& SubscriptionPendingState::GetSlotColl return state_machine_.subscription_data_.slot_collector_; } -score::cpp::optional SubscriptionPendingState::GetTransactionLogIndex() +std::optional SubscriptionPendingState::GetTransactionLogIndex() const noexcept { SCORE_LANGUAGE_FUTURECPP_ASSERT_MESSAGE(state_machine_.transaction_log_registration_guard_.has_value(), diff --git a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h index da16623b9..e2471f815 100644 --- a/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h +++ b/score/mw/com/impl/bindings/lola/subscription_subscription_pending_states.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/bindings/lola/subscription_state_base.h" #include "score/mw/com/impl/scoped_event_receive_handler.h" -#include +#include #include #include @@ -48,9 +48,9 @@ class SubscriptionPendingState final : public SubscriptionStateBase void SetReceiveHandler(std::weak_ptr handler) noexcept override; void UnsetReceiveHandler() noexcept override; std::optional GetMaxSampleCount() const noexcept override; - score::cpp::optional& GetSlotCollector() noexcept override; - const score::cpp::optional& GetSlotCollector() const noexcept override; - score::cpp::optional GetTransactionLogIndex() const noexcept override; + std::optional& GetSlotCollector() noexcept override; + const std::optional& GetSlotCollector() const noexcept override; + std::optional GetTransactionLogIndex() const noexcept override; }; } // namespace score::mw::com::impl::lola diff --git a/score/mw/com/impl/bindings/lola/test/proxy_component_test.cpp b/score/mw/com/impl/bindings/lola/test/proxy_component_test.cpp index b8d7b7719..015ccd224 100644 --- a/score/mw/com/impl/bindings/lola/test/proxy_component_test.cpp +++ b/score/mw/com/impl/bindings/lola/test/proxy_component_test.cpp @@ -40,7 +40,6 @@ #include "score/os/unistd.h" #include "score/os/utils/inotify/inotify_instance_impl.h" -#include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include #include #include #include diff --git a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp index cc0dec27d..f4f775dbe 100644 --- a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp +++ b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.cpp @@ -141,7 +141,7 @@ LolaProxyEventResources::~LolaProxyEventResources() } std::future> LolaProxyEventResources::ExpectRegisterEventNotification( - score::cpp::optional pid) + std::optional pid) { const auto pid_to_use = pid.has_value() ? pid.value() : kDummyPid; @@ -166,14 +166,14 @@ std::future> LolaProxyEventResources: return local_handler_future; } -void LolaProxyEventResources::ExpectReregisterEventNotification(score::cpp::optional pid) +void LolaProxyEventResources::ExpectReregisterEventNotification(std::optional pid) { const auto pid_to_use = pid.has_value() ? pid.value() : kDummyPid; EXPECT_CALL(*mock_service_, ReregisterEventNotification(QualityType::kASIL_QM, element_fq_id_, pid_to_use)) .RetiresOnSaturation(); } -void LolaProxyEventResources::ExpectUnregisterEventNotification(score::cpp::optional pid) +void LolaProxyEventResources::ExpectUnregisterEventNotification(std::optional pid) { const auto pid_to_use = pid.has_value() ? pid.value() : kDummyPid; EXPECT_CALL(*mock_service_, diff --git a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h index a5c05181d..24c7e99d3 100644 --- a/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h +++ b/score/mw/com/impl/bindings/lola/test/proxy_event_test_resources.h @@ -38,7 +38,7 @@ #include "score/os/mocklib/fcntl_mock.h" #include "score/os/mocklib/unistdmock.h" -#include +#include #include #include @@ -224,9 +224,9 @@ class LolaProxyEventResources : public ProxyMockedMemoryFixture ~LolaProxyEventResources() override; std::future> ExpectRegisterEventNotification( - score::cpp::optional pid = {}); - void ExpectReregisterEventNotification(score::cpp::optional pid = {}); - void ExpectUnregisterEventNotification(score::cpp::optional pid = {}); + std::optional pid = {}); + void ExpectReregisterEventNotification(std::optional pid = {}); + void ExpectUnregisterEventNotification(std::optional pid = {}); SlotIndexType PutData(const std::uint32_t value = 42, const EventSlotStatus::EventTimeStamp timestamp = 1); diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp index 30ff16ad8..f10fa6de8 100644 --- a/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp +++ b/score/mw/com/impl/bindings/lola/test/skeleton_component_test.cpp @@ -176,9 +176,9 @@ class SkeletonComponentTestFixture : public ::testing::Test SkeletonComponentTestFixture& WithAServiceInstanceDeploymentContainingSingleEventAndField( const QualityType quality_type, - score::cpp::optional configured_shared_memory_size = {}, - score::cpp::optional configured_control_asil_b_shared_memory_size = {}, - score::cpp::optional configured_control_qm_shared_memory_size = {}) + std::optional configured_shared_memory_size = {}, + std::optional configured_control_asil_b_shared_memory_size = {}, + std::optional configured_control_qm_shared_memory_size = {}) { events_.emplace(test::kFooEventName, mock_event_binding_); lola_event_instance_deployments_.push_back( diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp index abaaf7fdd..0c0a23b98 100644 --- a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp +++ b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.cpp @@ -48,9 +48,9 @@ LolaServiceInstanceDeployment CreateLolaServiceInstanceDeployment( std::vector> lola_method_inst_depls, std::vector allowed_consumers_qm, std::vector allowed_consumers_asil_b, - score::cpp::optional shm_size, - score::cpp::optional control_asil_b_shm_size, - score::cpp::optional control_qm_shm_size) + std::optional shm_size, + std::optional control_asil_b_shm_size, + std::optional control_qm_shm_size) { LolaServiceInstanceDeployment lola_service_instance_deployment_{LolaServiceInstanceId{instance_id}}; for (auto user_id : allowed_consumers_qm) diff --git a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h index 4d680f124..52c769a49 100644 --- a/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h +++ b/score/mw/com/impl/bindings/lola/test/skeleton_test_resources.h @@ -49,7 +49,7 @@ #include "score/os/mocklib/stat_mock.h" #include "score/os/mocklib/unistdmock.h" -#include +#include #include #include @@ -74,9 +74,9 @@ LolaServiceInstanceDeployment CreateLolaServiceInstanceDeployment( std::vector> lola_method_inst_depls, std::vector allowed_consumers_qm, std::vector allowed_consumers_asil_b, - score::cpp::optional size = score::cpp::nullopt, - score::cpp::optional control_asil_b_shm_size = score::cpp::nullopt, - score::cpp::optional control_qm_shm_size = score::cpp::nullopt); + std::optional size = std::nullopt, + std::optional control_asil_b_shm_size = std::nullopt, + std::optional control_qm_shm_size = std::nullopt); /// \brief Creates a ServiceTypeDeployment, which is effectively a LolaServiceTypeDeployment as we currently do not /// support any other. @@ -341,7 +341,7 @@ static const ServiceTypeDeployment kValidTypeDeploymentWithMethods{ static const ServiceTypeDeployment kValidMinimalTypeDeploymentWithBlankBinding{score::cpp::blank{}}; -static const score::cpp::optional kSimulatedShmSize{}; +static const std::optional kSimulatedShmSize{}; const auto kControlChannelPathQm{"/lola-ctl-0000000000000001-00016"}; const auto kControlChannelPathAsilB{"/lola-ctl-0000000000000001-00016-b"}; diff --git a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h index d7506f033..2aa2f5265 100644 --- a/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h +++ b/score/mw/com/impl/bindings/lola/test/transaction_log_test_resources.h @@ -41,7 +41,7 @@ class TransactionLogSetAttorney return transaction_log_set_.proxy_transaction_logs_; } - const score::cpp::optional> GetSkeletonTransactionLog() noexcept + const std::optional> GetSkeletonTransactionLog() noexcept { auto& skeleton_tracing_transaction_log = transaction_log_set_.skeleton_tracing_transaction_log_; if (!skeleton_tracing_transaction_log.IsActive()) diff --git a/score/mw/com/impl/bindings/lola/test_doubles/fake_service_data.h b/score/mw/com/impl/bindings/lola/test_doubles/fake_service_data.h index bba8afd4d..fe742d640 100644 --- a/score/mw/com/impl/bindings/lola/test_doubles/fake_service_data.h +++ b/score/mw/com/impl/bindings/lola/test_doubles/fake_service_data.h @@ -26,7 +26,7 @@ #include "score/memory/shared/offset_ptr.h" #include "score/memory/shared/shared_memory_factory.h" -#include +#include #include #include diff --git a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp index 2ae44a9e6..d4cd2a7ce 100644 --- a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp +++ b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp @@ -226,7 +226,7 @@ void TracingRuntime::CacheFileDescriptorForReregisteringShmObject( } } -score::cpp::optional> +std::optional> TracingRuntime::GetCachedFileDescriptorForReregisteringShmObject( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept { @@ -322,7 +322,7 @@ analysis::tracing::ServiceInstanceElement TracingRuntime::ConvertToTracingServic return output_service_instance_element; } -score::cpp::optional TracingRuntime::GetShmObjectHandle( +std::optional TracingRuntime::GetShmObjectHandle( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept { impl::tracing::ServiceElementInstanceIdentifierView lolaBindingSpecificIdentifier = @@ -336,7 +336,7 @@ score::cpp::optional TracingRuntime::GetShmO return find_result->second.first; } -score::cpp::optional TracingRuntime::GetShmRegionStartAddress( +std::optional TracingRuntime::GetShmRegionStartAddress( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept { impl::tracing::ServiceElementInstanceIdentifierView simplifiedIdentifier = diff --git a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h index e8c084a7d..f22ca6466 100644 --- a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h +++ b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h @@ -23,7 +23,6 @@ #include "score/language/safecpp/scoped_function/scope.h" #include "score/memory/shared/i_shared_memory_resource.h" -#include #include #include @@ -102,11 +101,11 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime void UnregisterShmObject(const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) noexcept override; - score::cpp::optional GetShmObjectHandle( + std::optional GetShmObjectHandle( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept override; - score::cpp::optional GetShmRegionStartAddress( + std::optional GetShmRegionStartAddress( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept override; @@ -115,7 +114,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime const memory::shared::ISharedMemoryResource::FileDescriptor shm_file_descriptor, void* const shm_memory_start_address) noexcept override; - score::cpp::optional> + std::optional> GetCachedFileDescriptorForReregisteringShmObject( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept override; @@ -151,7 +150,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall // be private.". We need these data elements to be organized into a coherent organized data structure. // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional sample_ptr; + std::optional sample_ptr; // coverity[autosar_cpp14_m11_0_1_violation] std::mutex mutex; }; @@ -170,7 +169,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime -> std::optional; const Configuration& configuration_; - score::cpp::optional trace_client_id_; + std::optional trace_client_id_; bool data_loss_flag_; /// \brief Array of type erased sample pointers containing one element per service element that registers itself via diff --git a/score/mw/com/impl/bindings/lola/transaction_log.h b/score/mw/com/impl/bindings/lola/transaction_log.h index e35ccc6ed..6dbc88067 100644 --- a/score/mw/com/impl/bindings/lola/transaction_log.h +++ b/score/mw/com/impl/bindings/lola/transaction_log.h @@ -126,7 +126,7 @@ class TransactionLog /// \brief The max sample count used for the recorded subscription transaction. /// /// This is set in SubscribeTransactionBegin() and used in the UnsubscribeCallback which is called during Rollback() - score::cpp::optional subscription_max_sample_count_; + std::optional subscription_max_sample_count_; }; } // namespace score::mw::com::impl::lola diff --git a/score/mw/com/impl/bindings/mock_binding/skeleton_event.h b/score/mw/com/impl/bindings/mock_binding/skeleton_event.h index c08e21d16..83acfe536 100644 --- a/score/mw/com/impl/bindings/mock_binding/skeleton_event.h +++ b/score/mw/com/impl/bindings/mock_binding/skeleton_event.h @@ -40,12 +40,12 @@ class SkeletonEvent : public SkeletonEventBinding MOCK_METHOD(ResultBlank, Send, (const SampleType& value, - score::cpp::optional::SendTraceCallback>), + std::optional::SendTraceCallback>), (noexcept, override)); MOCK_METHOD(ResultBlank, Send, (SampleAllocateePtr sample, - score::cpp::optional::SendTraceCallback>), + std::optional::SendTraceCallback>), (noexcept, override)); MOCK_METHOD(Result>, Allocate, (), (noexcept, override)); MOCK_METHOD(ResultBlank, PrepareOffer, (), (noexcept, override)); @@ -69,13 +69,13 @@ class SkeletonEventFacade : public SkeletonEventBinding ~SkeletonEventFacade() override = default; ResultBlank Send( const SampleType& value, - score::cpp::optional::SendTraceCallback> callback) noexcept override + std::optional::SendTraceCallback> callback) noexcept override { return skeleton_event_.Send(value, std::move(callback)); }; ResultBlank Send( SampleAllocateePtr sample, - score::cpp::optional::SendTraceCallback> callback) noexcept override + std::optional::SendTraceCallback> callback) noexcept override { return skeleton_event_.Send(std::move(sample), std::move(callback)); } diff --git a/score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h b/score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h index 2128cd1f7..a5a0965e0 100644 --- a/score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h +++ b/score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h @@ -36,11 +36,11 @@ class TracingRuntime : public IBindingTracingRuntime UnregisterShmObject, (const impl::tracing::ServiceElementInstanceIdentifierView&), (noexcept, override)); - MOCK_METHOD(score::cpp::optional, + MOCK_METHOD(std::optional, GetShmObjectHandle, (const impl::tracing::ServiceElementInstanceIdentifierView&), (const, noexcept, override)); - MOCK_METHOD(score::cpp::optional, + MOCK_METHOD(std::optional, GetShmRegionStartAddress, (const impl::tracing::ServiceElementInstanceIdentifierView&), (const, noexcept, override)); @@ -50,7 +50,7 @@ class TracingRuntime : public IBindingTracingRuntime memory::shared::ISharedMemoryResource::FileDescriptor, void*), (noexcept, override)); - MOCK_METHOD((score::cpp::optional>), + MOCK_METHOD((std::optional>), GetCachedFileDescriptorForReregisteringShmObject, (const impl::tracing::ServiceElementInstanceIdentifierView&), (const, noexcept, override)); diff --git a/score/mw/com/impl/configuration/BUILD b/score/mw/com/impl/configuration/BUILD index 5f3533474..b2d8cb3ad 100644 --- a/score/mw/com/impl/configuration/BUILD +++ b/score/mw/com/impl/configuration/BUILD @@ -288,7 +288,6 @@ cc_library( ":configuration_common_resources", ":service_version_type", "@score_baselibs//score/json", - "@score_baselibs//score/language/futurecpp", ], ) @@ -366,7 +365,6 @@ cc_library( ":someip_field_instance_deployment", ":someip_service_instance_id", "@score_baselibs//score/json", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", ], ) diff --git a/score/mw/com/impl/configuration/config_parser.cpp b/score/mw/com/impl/configuration/config_parser.cpp index 2a94070e7..15b7d4aa0 100644 --- a/score/mw/com/impl/configuration/config_parser.cpp +++ b/score/mw/com/impl/configuration/config_parser.cpp @@ -185,7 +185,7 @@ auto ParseServiceTypeIdentifier(const score::json::Object& json) -> ServiceIdent return make_ServiceIdentifierType(name.data(), version.first, version.second); } -auto ParseAsilLevel(const score::json::Object& json_map) -> score::cpp::optional +auto ParseAsilLevel(const score::json::Object& json_map) -> std::optional { const auto& quality = json_map.find(kAsilKey.data()); if (quality != json_map.cend()) @@ -208,10 +208,10 @@ auto ParseAsilLevel(const score::json::Object& json_map) -> score::cpp::optional return QualityType::kInvalid; } - return score::cpp::nullopt; + return std::nullopt; } -auto ParseShmSizeCalcMode(const score::json::Object& json_map) -> score::cpp::optional +auto ParseShmSizeCalcMode(const score::json::Object& json_map) -> std::optional { const auto& shm_size_calc_mode = json_map.find(kShmSizeCalcModeKey.data()); if (shm_size_calc_mode != json_map.cend()) @@ -233,7 +233,7 @@ auto ParseShmSizeCalcMode(const score::json::Object& json_map) -> score::cpp::op } } - return score::cpp::nullopt; + return std::nullopt; } // Note 1: @@ -1068,7 +1068,7 @@ auto ParseServiceTypes(const score::json::Object& json_map) -> Configuration::Se } auto ParseReceiverQueueSize(const score::json::Object& global_config_map, const QualityType quality_type) - -> score::cpp::optional + -> std::optional { const auto& queue_size = global_config_map.find(kQueueSizeKey.data()); if (queue_size != global_config_map.cend()) @@ -1096,23 +1096,30 @@ auto ParseReceiverQueueSize(const score::json::Object& global_config_map, const const auto& asil_queue_size = queue_size_map.find(queue_type_str.data()); if (asil_queue_size != queue_size_map.cend()) { - return score::ResultToAmpOptionalOrElse(asil_queue_size->second.As(), [](const auto&) { + if (!asil_queue_size->second.As().has_value()) + { score::mw::log::LogFatal("lola") << "Invalid value for ReceiverQueueSize"; SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(false); - }); + } else { + return asil_queue_size->second.As().value(); + } +// return score::ResultToAmpOptionalOrElse(asil_queue_size->second.As(), [](const auto&) { +// score::mw::log::LogFatal("lola") << "Invalid value for ReceiverQueueSize"; +// SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(false); +// }); } else { - return score::cpp::nullopt; + return std::nullopt; } } else { - return score::cpp::nullopt; + return std::nullopt; } } -auto ParseSenderQueueSize(const score::json::Object& global_config_map) -> score::cpp::optional +auto ParseSenderQueueSize(const score::json::Object& global_config_map) -> std::optional { const auto& queue_size = global_config_map.find(kQueueSizeKey.data()); if (queue_size != global_config_map.cend()) @@ -1124,19 +1131,26 @@ auto ParseSenderQueueSize(const score::json::Object& global_config_map) -> score const auto& asil_tx_queue_size = queue_size_map.find("B-sender"); if (asil_tx_queue_size != queue_size_map.cend()) { - return score::ResultToAmpOptionalOrElse(asil_tx_queue_size->second.As(), [](const auto&) { + if (!asil_tx_queue_size->second.As().has_value()) + { score::mw::log::LogFatal("lola") << "Invalid value for SenderQueueSize"; SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(false); - }); + } else { + return asil_tx_queue_size->second.As().value(); + } +// return score::ResultToAmpOptionalOrElse(asil_tx_queue_size->second.As(), [](const auto&) { +// score::mw::log::LogFatal("lola") << "Invalid value for SenderQueueSize"; +// SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(false); +// }); } else { - return score::cpp::nullopt; + return std::nullopt; } } else { - return score::cpp::nullopt; + return std::nullopt; } } @@ -1181,27 +1195,27 @@ auto ParseGlobalProperties(const score::json::Object& top_level_object) -> Globa } } - const score::cpp::optional qm_rx_message_size{ + const std::optional qm_rx_message_size{ ParseReceiverQueueSize(process_properties_map, QualityType::kASIL_QM)}; if (qm_rx_message_size.has_value()) { global_configuration.SetReceiverMessageQueueSize(QualityType::kASIL_QM, qm_rx_message_size.value()); } - const score::cpp::optional b_rx_message_size{ + const std::optional b_rx_message_size{ ParseReceiverQueueSize(process_properties_map, QualityType::kASIL_B)}; if (b_rx_message_size.has_value()) { global_configuration.SetReceiverMessageQueueSize(QualityType::kASIL_B, b_rx_message_size.value()); } - const score::cpp::optional b_tx_message_size{ParseSenderQueueSize(process_properties_map)}; + const std::optional b_tx_message_size{ParseSenderQueueSize(process_properties_map)}; if (b_tx_message_size.has_value()) { global_configuration.SetSenderMessageQueueSize(b_tx_message_size.value()); } - const score::cpp::optional shm_size_calc_mode{ + const std::optional shm_size_calc_mode{ ParseShmSizeCalcMode(process_properties_map)}; if (shm_size_calc_mode.has_value()) { diff --git a/score/mw/com/impl/configuration/configuration_common_resources_test.cpp b/score/mw/com/impl/configuration/configuration_common_resources_test.cpp index abc68ed76..6a2bf631c 100644 --- a/score/mw/com/impl/configuration/configuration_common_resources_test.cpp +++ b/score/mw/com/impl/configuration/configuration_common_resources_test.cpp @@ -14,7 +14,7 @@ #include "score/json/json_parser.h" -#include +#include #include diff --git a/score/mw/com/impl/configuration/configuration_test.cpp b/score/mw/com/impl/configuration/configuration_test.cpp index dbb353145..74de8a489 100644 --- a/score/mw/com/impl/configuration/configuration_test.cpp +++ b/score/mw/com/impl/configuration/configuration_test.cpp @@ -19,10 +19,10 @@ #include "score/json/internal/model/any.h" #include "score/json/json_writer.h" -#include #include #include +#include #include #include @@ -86,7 +86,7 @@ class ConfigurationFixture : public ::testing::Test } } - score::cpp::optional unit_{}; + std::optional unit_{}; }; score::Result GetStringFromJson(const json::Object& json_object) diff --git a/score/mw/com/impl/configuration/global_configuration.h b/score/mw/com/impl/configuration/global_configuration.h index 2c285ac79..f0487a4e0 100644 --- a/score/mw/com/impl/configuration/global_configuration.h +++ b/score/mw/com/impl/configuration/global_configuration.h @@ -16,7 +16,7 @@ #include "score/mw/com/impl/configuration/quality_type.h" #include "score/mw/com/impl/configuration/shm_size_calc_mode.h" -#include +#include #include #include @@ -83,7 +83,7 @@ class GlobalConfiguration final application_id_ = application_id; } - score::cpp::optional GetApplicationId() const + std::optional GetApplicationId() const { return application_id_; } @@ -96,7 +96,7 @@ class GlobalConfiguration final private: /// properties/settings from the "global" section QualityType process_asil_level_; - score::cpp::optional application_id_; + std::optional application_id_; std::int32_t message_rx_queue_size_qm; std::int32_t message_rx_queue_size_b; diff --git a/score/mw/com/impl/configuration/lola_event_instance_deployment.cpp b/score/mw/com/impl/configuration/lola_event_instance_deployment.cpp index 024018bda..fad965394 100644 --- a/score/mw/com/impl/configuration/lola_event_instance_deployment.cpp +++ b/score/mw/com/impl/configuration/lola_event_instance_deployment.cpp @@ -16,7 +16,7 @@ #include "score/mw/log/logging.h" -#include +#include #include namespace score::mw::com::impl diff --git a/score/mw/com/impl/configuration/lola_event_instance_deployment.h b/score/mw/com/impl/configuration/lola_event_instance_deployment.h index a870f84e8..041a04e79 100644 --- a/score/mw/com/impl/configuration/lola_event_instance_deployment.h +++ b/score/mw/com/impl/configuration/lola_event_instance_deployment.h @@ -15,7 +15,6 @@ #include "score/json/json_parser.h" -#include #include #include diff --git a/score/mw/com/impl/configuration/lola_service_instance_deployment.cpp b/score/mw/com/impl/configuration/lola_service_instance_deployment.cpp index 2d9e25031..21c790051 100644 --- a/score/mw/com/impl/configuration/lola_service_instance_deployment.cpp +++ b/score/mw/com/impl/configuration/lola_service_instance_deployment.cpp @@ -136,7 +136,7 @@ bool operator<(const LolaServiceInstanceDeployment& lhs, const LolaServiceInstan } // In this case the constructor delegation does not provide additional code structuring because of the -// score::cpp::optional By adding a third private constructor additional complexity would be introduced +// std::optional. By adding a third private constructor additional complexity would be introduced // // See Note 1 for autosar_cpp14_a15_5_3_violation. // coverity[autosar_cpp14_a12_1_5_violation] @@ -160,7 +160,7 @@ LolaServiceInstanceDeployment::LolaServiceInstanceDeployment(const score::json:: const auto instance_id_it = json_object.find(kInstanceIdKeyInstDepl); if (instance_id_it != json_object.end()) { - instance_id_ = instance_id_it->second.As().value(); + instance_id_ = static_cast(instance_id_it->second.As().value()); } const auto shared_memory_size_it = json_object.find(kSharedMemorySizeKeyInstDepl); @@ -187,7 +187,7 @@ LolaServiceInstanceDeployment::LolaServiceInstanceDeployment(const score::json:: // Justification: This constructor is used by other constructors for delegation. // coverity[autosar_cpp14_a12_1_5_violation] LolaServiceInstanceDeployment::LolaServiceInstanceDeployment( - const score::cpp::optional instance_id, + const std::optional instance_id, EventInstanceMapping events, FieldInstanceMapping fields, MethodInstanceMapping methods, diff --git a/score/mw/com/impl/configuration/lola_service_instance_deployment.h b/score/mw/com/impl/configuration/lola_service_instance_deployment.h index 1ff73df53..fb8207a6f 100644 --- a/score/mw/com/impl/configuration/lola_service_instance_deployment.h +++ b/score/mw/com/impl/configuration/lola_service_instance_deployment.h @@ -24,10 +24,10 @@ #include "score/mw/log/logging.h" #include -#include #include #include +#include #include #include #include @@ -45,7 +45,7 @@ class LolaServiceInstanceDeployment LolaServiceInstanceDeployment() = default; explicit LolaServiceInstanceDeployment(const score::json::Object& json_object) noexcept; explicit LolaServiceInstanceDeployment( - const score::cpp::optional instance_id, + const std::optional instance_id, EventInstanceMapping events = {}, FieldInstanceMapping fields = {}, MethodInstanceMapping methods = {}, @@ -62,13 +62,13 @@ class LolaServiceInstanceDeployment // The struct is used as a config storage obtained by performing the parsing json object. // Public access is required by the implementation to reach the following members of the struct. // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional instance_id_; + std::optional instance_id_; // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional shared_memory_size_; + std::optional shared_memory_size_; // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional control_asil_b_memory_size_; + std::optional control_asil_b_memory_size_; // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional control_qm_memory_size_; + std::optional control_qm_memory_size_; // coverity[autosar_cpp14_m11_0_1_violation] EventInstanceMapping events_; // key = event name // coverity[autosar_cpp14_m11_0_1_violation] diff --git a/score/mw/com/impl/configuration/lola_service_instance_deployment_test.cpp b/score/mw/com/impl/configuration/lola_service_instance_deployment_test.cpp index 208955542..4c3fac42b 100644 --- a/score/mw/com/impl/configuration/lola_service_instance_deployment_test.cpp +++ b/score/mw/com/impl/configuration/lola_service_instance_deployment_test.cpp @@ -308,14 +308,14 @@ using LolaServiceInstanceDeploymentEqualityFixture = ConfigurationStructsFixture TEST_F(LolaServiceInstanceDeploymentEqualityFixture, ComparingSameDeploymentsReturnsTrue) { // Given two LolaServiceInstanceDeployments containing the same data - const LolaServiceInstanceDeployment unit{1U, + const LolaServiceInstanceDeployment unit{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}, {}, true, kAllowedConsumers, kAllowedProviders}; - const LolaServiceInstanceDeployment unit2{1U, + const LolaServiceInstanceDeployment unit2{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}, {}, @@ -351,43 +351,43 @@ INSTANTIATE_TEST_CASE_P( LolaServiceInstanceDeploymentEqualityParamaterisedFixture, LolaServiceInstanceDeploymentEqualityParamaterisedFixture, ::testing::Values( - std::make_pair(LolaServiceInstanceDeployment{1U}, LolaServiceInstanceDeployment{2U}), + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}, LolaServiceInstanceDeployment{LolaServiceInstanceId{2U}}), - std::make_pair(LolaServiceInstanceDeployment{1U, + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"first_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}}, - LolaServiceInstanceDeployment{1U, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"second_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}}), - std::make_pair(LolaServiceInstanceDeployment{1U, + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}}, - LolaServiceInstanceDeployment{1U, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment2}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}}), - std::make_pair(LolaServiceInstanceDeployment{1U, + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment}}}, - LolaServiceInstanceDeployment{1U, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {{"same_event_name", kDummyLolaEventInstanceDeployment}}, {{"same_field_name", kDummyLolaFieldInstanceDeployment2}}}), - std::make_pair(LolaServiceInstanceDeployment{1U, {}, {}, {}, true}, - LolaServiceInstanceDeployment{1U, {}, {}, {}, false}), + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, true}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, false}), - std::make_pair(LolaServiceInstanceDeployment{1U, {}, {}, {}, true, kAllowedConsumers2, kAllowedProviders}, - LolaServiceInstanceDeployment{1U, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}), + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, true, kAllowedConsumers2, kAllowedProviders}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}), - std::make_pair(LolaServiceInstanceDeployment{1U, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders2}, - LolaServiceInstanceDeployment{1U, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}))); + std::make_pair(LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders2}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}))); TEST(LolaServiceInstanceDeploymentLessThan, DeploymentsComparedBasedOnInstanceId) { // Given 2 LolaServiceInstanceDeployments containing different values - const LolaServiceInstanceDeployment lhs{1U, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}; - const LolaServiceInstanceDeployment rhs{2U, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}; + const LolaServiceInstanceDeployment lhs{LolaServiceInstanceId{1U}, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}; + const LolaServiceInstanceDeployment rhs{LolaServiceInstanceId{2U}, {}, {}, {}, true, kAllowedConsumers, kAllowedProviders}; // When comparing the two // Then the result is based on the instance IDs diff --git a/score/mw/com/impl/configuration/service_instance_deployment_test.cpp b/score/mw/com/impl/configuration/service_instance_deployment_test.cpp index 8d66fbae1..75fcfcdeb 100644 --- a/score/mw/com/impl/configuration/service_instance_deployment_test.cpp +++ b/score/mw/com/impl/configuration/service_instance_deployment_test.cpp @@ -95,7 +95,7 @@ TEST_F(ServiceInstanceDeploymentFixture, CanConstructFromLolaServiceInstanceDepl TEST_F(ServiceInstanceDeploymentFixture, CanConstructFromSomeIpServiceInstanceDeployment) { ServiceInstanceDeployment unit{ - kDummyService, SomeIpServiceInstanceDeployment{16U}, QualityType::kASIL_QM, kInstanceSpecifier}; + kDummyService, SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{16U}}, QualityType::kASIL_QM, kInstanceSpecifier}; ASSERT_EQ(unit.asilLevel_, QualityType::kASIL_QM); ExpectServiceIdentifierTypeObjectsEqual(unit.service_, kDummyService); @@ -131,7 +131,7 @@ TEST_F(ServiceInstanceDeploymentFixture, CanCreateFromSerializedSomeIpObject) { const std::uint16_t instance_id{123U}; - SomeIpServiceInstanceDeployment someip_service_instance_deployment{instance_id}; + SomeIpServiceInstanceDeployment someip_service_instance_deployment{SomeIpServiceInstanceId{instance_id}}; ServiceInstanceDeployment unit{ kDummyService, someip_service_instance_deployment, QualityType::kASIL_B, kInstanceSpecifier}; @@ -263,7 +263,7 @@ TEST(ServiceInstanceDeploymentTest, GetBindingTypeReturnsSomeIpForSomeIpBinding) { // Given a ServiceInstanceDeployment const auto unit = ServiceInstanceDeployment{ - kDummyService, SomeIpServiceInstanceDeployment{16U}, QualityType::kASIL_QM, kInstanceSpecifier}; + kDummyService, SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{16U}}, QualityType::kASIL_QM, kInstanceSpecifier}; // When getting the binding type // Then it should return BindingType::kSomeIp @@ -383,68 +383,68 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values( // Comparing two ServiceInstanceDeployments with equal bindings compares based on Asil level std::make_pair(ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{1U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{1U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}, QualityType::kASIL_B, kInstanceSpecifier}), // Comparing two LolaServiceInstanceDeployments compares based on InstanceId only std::make_pair(ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{1U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{2U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{2U}}, QualityType::kASIL_B, kInstanceSpecifier}), std::make_pair(ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{1U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}, QualityType::kASIL_B, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{2U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{2U}}, QualityType::kASIL_QM, kInstanceSpecifier}), // Comparing two SomeIpServiceInstanceDeployments compares based on InstanceId only std::make_pair(ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{1U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{1U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{2U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{2U}}, QualityType::kASIL_B, kInstanceSpecifier}), std::make_pair(ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{1U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{1U}}, QualityType::kASIL_B, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{2U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{2U}}, QualityType::kASIL_QM, kInstanceSpecifier}), // Comparing difference ServiceInstanceDeployment bindings compares based on variant index std::make_pair(ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{2U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{2U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{1U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{1U}}, QualityType::kASIL_B, kInstanceSpecifier}), std::make_pair( ServiceInstanceDeployment{kDummyService, - LolaServiceInstanceDeployment{2U}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{2U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, score::cpp::blank{}, QualityType::kASIL_B, kInstanceSpecifier}), std::make_pair( ServiceInstanceDeployment{kDummyService, - SomeIpServiceInstanceDeployment{2U}, + SomeIpServiceInstanceDeployment{SomeIpServiceInstanceId{2U}}, QualityType::kASIL_QM, kInstanceSpecifier}, ServiceInstanceDeployment{kDummyService, score::cpp::blank{}, QualityType::kASIL_B, kInstanceSpecifier}))); diff --git a/score/mw/com/impl/configuration/service_version_type.h b/score/mw/com/impl/configuration/service_version_type.h index fb35d829d..830390db9 100644 --- a/score/mw/com/impl/configuration/service_version_type.h +++ b/score/mw/com/impl/configuration/service_version_type.h @@ -15,7 +15,7 @@ #include "score/json/json_parser.h" -#include +#include #include #include diff --git a/score/mw/com/impl/configuration/someip_service_instance_deployment.cpp b/score/mw/com/impl/configuration/someip_service_instance_deployment.cpp index bedafc943..17373694b 100644 --- a/score/mw/com/impl/configuration/someip_service_instance_deployment.cpp +++ b/score/mw/com/impl/configuration/someip_service_instance_deployment.cpp @@ -76,7 +76,7 @@ SomeIpServiceInstanceDeployment::SomeIpServiceInstanceDeployment(const score::js const auto instance_id_it = json_object.find(kInstanceIdKeySerInstDepl); if (instance_id_it != json_object.end()) { - instance_id_ = instance_id_it->second.As().value(); + instance_id_ = static_cast(instance_id_it->second.As().value()); } const auto serialization_version = diff --git a/score/mw/com/impl/configuration/someip_service_instance_deployment.h b/score/mw/com/impl/configuration/someip_service_instance_deployment.h index e9aed6820..2196de968 100644 --- a/score/mw/com/impl/configuration/someip_service_instance_deployment.h +++ b/score/mw/com/impl/configuration/someip_service_instance_deployment.h @@ -19,7 +19,7 @@ #include "score/json/json_parser.h" -#include +#include #include #include @@ -36,7 +36,7 @@ class SomeIpServiceInstanceDeployment using FieldInstanceMapping = std::unordered_map; explicit SomeIpServiceInstanceDeployment(const score::json::Object& json_object) noexcept; - explicit SomeIpServiceInstanceDeployment(score::cpp::optional instance_id = {}, + explicit SomeIpServiceInstanceDeployment(std::optional instance_id = {}, EventInstanceMapping events = {}, FieldInstanceMapping fields = {}) : instance_id_{instance_id}, events_{std::move(events)}, fields_{std::move(fields)} @@ -49,7 +49,7 @@ class SomeIpServiceInstanceDeployment // The struct is used as a config storage obtained by performing the parsing json object. // Public access is required by the implementation to reach the following members of the struct. // coverity[autosar_cpp14_m11_0_1_violation] - score::cpp::optional instance_id_; + std::optional instance_id_; // coverity[autosar_cpp14_m11_0_1_violation] EventInstanceMapping events_; // key = event name // coverity[autosar_cpp14_m11_0_1_violation] diff --git a/score/mw/com/impl/configuration/someip_service_instance_deployment_test.cpp b/score/mw/com/impl/configuration/someip_service_instance_deployment_test.cpp index 1d2cfeadf..602aa0502 100644 --- a/score/mw/com/impl/configuration/someip_service_instance_deployment_test.cpp +++ b/score/mw/com/impl/configuration/someip_service_instance_deployment_test.cpp @@ -88,7 +88,7 @@ TEST_F(SomeIpServiceInstanceDeploymentFixture, CanCreateFromSerializedObjectWith TEST(SomeIpServiceInstanceDeploymentDeathTest, CreatingFromSerializedObjectWithMismatchedSerializationVersionTerminates) { - const SomeIpServiceInstanceDeployment unit{42U}; + const SomeIpServiceInstanceDeployment unit{SomeIpServiceInstanceId{42U}}; const auto serialization_version_key = "serializationVersion"; const std::uint32_t invalid_serialization_version = SomeIpServiceInstanceDeployment::serializationVersion + 1; @@ -104,8 +104,8 @@ TEST(SomeIpServiceInstanceDeploymentDeathTest, CreatingFromSerializedObjectWithM TEST(LolaServiceInstanceDeploymentLessThan, DeploymentsComparedBasedOnInstanceId) { // Given 2 SomeIpServiceInstanceDeployments containing different values - const SomeIpServiceInstanceDeployment lhs{1U}; - const SomeIpServiceInstanceDeployment rhs{2U}; + const SomeIpServiceInstanceDeployment lhs{SomeIpServiceInstanceId{1U}}; + const SomeIpServiceInstanceDeployment rhs{SomeIpServiceInstanceId{2U}}; // When comparing the two // Then the result is based on the instance IDs diff --git a/score/mw/com/impl/configuration/test/configuration_store.cpp b/score/mw/com/impl/configuration/test/configuration_store.cpp index 024911311..17ddab50d 100644 --- a/score/mw/com/impl/configuration/test/configuration_store.cpp +++ b/score/mw/com/impl/configuration/test/configuration_store.cpp @@ -28,7 +28,7 @@ ConfigurationStore::ConfigurationStore(InstanceSpecifier instance_specifier, const ServiceIdentifierType service_identifier, const QualityType quality_type, const LolaServiceId lola_service_id, - const score::cpp::optional lola_instance_id) noexcept + const std::optional lola_instance_id) noexcept : service_identifier_{service_identifier}, instance_specifier_{std::move(instance_specifier)}, quality_type_{quality_type}, @@ -68,7 +68,7 @@ InstanceIdentifier ConfigurationStore::GetInstanceIdentifier() const noexcept } EnrichedInstanceIdentifier ConfigurationStore::GetEnrichedInstanceIdentifier( - score::cpp::optional instance_id) const noexcept + std::optional instance_id) const noexcept { if (instance_id.has_value()) { @@ -77,7 +77,7 @@ EnrichedInstanceIdentifier ConfigurationStore::GetEnrichedInstanceIdentifier( return EnrichedInstanceIdentifier(GetInstanceIdentifier()); } -HandleType ConfigurationStore::GetHandle(score::cpp::optional instance_id) const noexcept +HandleType ConfigurationStore::GetHandle(std::optional instance_id) const noexcept { return make_HandleType(GetInstanceIdentifier(), instance_id); } diff --git a/score/mw/com/impl/configuration/test/configuration_store.h b/score/mw/com/impl/configuration/test/configuration_store.h index ffe2636c5..6819df9e4 100644 --- a/score/mw/com/impl/configuration/test/configuration_store.h +++ b/score/mw/com/impl/configuration/test/configuration_store.h @@ -28,9 +28,9 @@ #include "score/mw/com/impl/instance_specifier.h" #include -#include #include +#include namespace score::mw::com::impl { @@ -42,7 +42,7 @@ class ConfigurationStore final const ServiceIdentifierType service_identifier, const QualityType quality_type, const LolaServiceId lola_service_id, - const score::cpp::optional lola_instance_id) noexcept; + const std::optional lola_instance_id) noexcept; ConfigurationStore(InstanceSpecifier instance_specifier, const ServiceIdentifierType service_identifier, @@ -52,13 +52,13 @@ class ConfigurationStore final InstanceIdentifier GetInstanceIdentifier() const noexcept; EnrichedInstanceIdentifier GetEnrichedInstanceIdentifier( - score::cpp::optional instance_id = {}) const noexcept; - HandleType GetHandle(score::cpp::optional instance_id = {}) const noexcept; + std::optional instance_id = {}) const noexcept; + HandleType GetHandle(std::optional instance_id = {}) const noexcept; ServiceIdentifierType service_identifier_; InstanceSpecifier instance_specifier_; QualityType quality_type_; - score::cpp::optional lola_instance_id_; + std::optional lola_instance_id_; LolaServiceTypeDeployment lola_service_type_deployment_; LolaServiceInstanceDeployment lola_service_instance_deployment_; diff --git a/score/mw/com/impl/configuration/test/configuration_test_resources.cpp b/score/mw/com/impl/configuration/test/configuration_test_resources.cpp index 7a2d28660..a6b9ed22b 100644 --- a/score/mw/com/impl/configuration/test/configuration_test_resources.cpp +++ b/score/mw/com/impl/configuration/test/configuration_test_resources.cpp @@ -69,10 +69,10 @@ LolaMethodInstanceDeployment MakeLolaMethodInstanceDeployment( } LolaServiceInstanceDeployment MakeLolaServiceInstanceDeployment( - const score::cpp::optional instance_id, - const score::cpp::optional shared_memory_size, - const score::cpp::optional control_asil_b_memory_size, - const score::cpp::optional control_qm_memory_size) noexcept + const std::optional instance_id, + const std::optional shared_memory_size, + const std::optional control_asil_b_memory_size, + const std::optional control_qm_memory_size) noexcept { const LolaEventInstanceDeployment event_instance_deployment_1{MakeLolaEventInstanceDeployment(12U, 13U)}; const LolaEventInstanceDeployment event_instance_deployment_2{MakeLolaEventInstanceDeployment(14U, 15U)}; @@ -112,7 +112,7 @@ LolaServiceInstanceDeployment MakeLolaServiceInstanceDeployment( } SomeIpServiceInstanceDeployment MakeSomeIpServiceInstanceDeployment( - const score::cpp::optional instance_id) noexcept + const std::optional instance_id) noexcept { const SomeIpEventInstanceDeployment event_instance_deployment_1{}; const SomeIpEventInstanceDeployment event_instance_deployment_2{}; diff --git a/score/mw/com/impl/configuration/test/configuration_test_resources.h b/score/mw/com/impl/configuration/test/configuration_test_resources.h index a85cf8522..f14e1afb9 100644 --- a/score/mw/com/impl/configuration/test/configuration_test_resources.h +++ b/score/mw/com/impl/configuration/test/configuration_test_resources.h @@ -30,12 +30,12 @@ #include "score/mw/com/impl/configuration/someip_field_instance_deployment.h" #include "score/mw/com/impl/configuration/someip_service_instance_id.h" -#include #include #include #include #include +#include #include namespace score::mw::com::impl @@ -63,13 +63,13 @@ LolaMethodInstanceDeployment MakeLolaMethodInstanceDeployment( const std::optional queue_size = 10U) noexcept; LolaServiceInstanceDeployment MakeLolaServiceInstanceDeployment( - const score::cpp::optional instance_id = 21U, - const score::cpp::optional shared_memory_size = 2000U, - const score::cpp::optional control_asil_b_memory_size = 3000U, - const score::cpp::optional control_qm_memory_size = 4000U) noexcept; + const std::optional instance_id = LolaServiceInstanceId{21U}, + const std::optional shared_memory_size = 2000U, + const std::optional control_asil_b_memory_size = 3000U, + const std::optional control_qm_memory_size = 4000U) noexcept; SomeIpServiceInstanceDeployment MakeSomeIpServiceInstanceDeployment( - const score::cpp::optional instance_id = 22U) noexcept; + const std::optional instance_id = SomeIpServiceInstanceId{22U}) noexcept; LolaServiceTypeDeployment MakeLolaServiceTypeDeployment(const std::uint16_t service_id = 31U) noexcept; diff --git a/score/mw/com/impl/enriched_instance_identifier.h b/score/mw/com/impl/enriched_instance_identifier.h index 06dab115a..25321a325 100644 --- a/score/mw/com/impl/enriched_instance_identifier.h +++ b/score/mw/com/impl/enriched_instance_identifier.h @@ -18,8 +18,8 @@ #include "score/mw/com/impl/instance_identifier.h" #include -#include +#include #include namespace score::mw::com::impl @@ -52,7 +52,7 @@ class EnrichedInstanceIdentifier final // coverity[autosar_cpp14_a12_6_1_violation] EnrichedInstanceIdentifier(InstanceIdentifier instance_identifier, const ServiceInstanceId instance_id) noexcept : EnrichedInstanceIdentifier( - score::cpp::optional{instance_id}, + std::optional{instance_id}, InstanceIdentifierView{instance_identifier}.GetServiceInstanceDeployment().asilLevel_, instance_identifier) { @@ -79,7 +79,7 @@ class EnrichedInstanceIdentifier final { } - EnrichedInstanceIdentifier(score::cpp::optional instance_id, + EnrichedInstanceIdentifier(std::optional instance_id, QualityType quality_type, InstanceIdentifier instance_identifier) noexcept : instance_identifier_{std::move(instance_identifier)}, instance_id_{instance_id}, quality_type_{quality_type} @@ -97,19 +97,19 @@ class EnrichedInstanceIdentifier final // The GetBindingSpecificServiceId class is a templated function, each translation unit will instantiate // it separately. This can not be avoided. // coverity[autosar_cpp14_m3_2_2_violation] - score::cpp::optional GetBindingSpecificServiceId() const noexcept + std::optional GetBindingSpecificServiceId() const noexcept { const InstanceIdentifierView instance_identifier_view{instance_identifier_}; const auto* service_deployment = std::get_if(&(instance_identifier_view.GetServiceTypeDeployment().binding_info_)); if (service_deployment == nullptr) { - return score::cpp::nullopt; + return std::nullopt; } return service_deployment->service_id_; } - const score::cpp::optional& GetInstanceId() const noexcept + const std::optional& GetInstanceId() const noexcept { return instance_id_; } @@ -119,17 +119,17 @@ class EnrichedInstanceIdentifier final // The GetBindingSpecificInstanceId class is a templated function, each translation unit will instantiate // it separately. This can not be avoided. // coverity[autosar_cpp14_m3_2_2_violation] - score::cpp::optional GetBindingSpecificInstanceId() const noexcept + std::optional GetBindingSpecificInstanceId() const noexcept { if (!instance_id_.has_value()) { - return score::cpp::nullopt; + return std::nullopt; } const auto* instance_id = std::get_if(&(instance_id_->binding_info_)); if (instance_id == nullptr) { - return score::cpp::nullopt; + return std::nullopt; } return instance_id->GetId(); } @@ -141,7 +141,7 @@ class EnrichedInstanceIdentifier final private: InstanceIdentifier instance_identifier_; - score::cpp::optional instance_id_; + std::optional instance_id_; QualityType quality_type_; }; diff --git a/score/mw/com/impl/generic_proxy_event_test.cpp b/score/mw/com/impl/generic_proxy_event_test.cpp index c9e18dbe2..c5fab23e7 100644 --- a/score/mw/com/impl/generic_proxy_event_test.cpp +++ b/score/mw/com/impl/generic_proxy_event_test.cpp @@ -129,7 +129,7 @@ TEST(GenericProxyEventDeathTest, DieOnProxyDestructionWhileHoldingSamplePtrs) EXPECT_CALL(mock_proxy_event, GetSubscriptionState()) .WillOnce(::testing::Return(SubscriptionState::kNotSubscribed)); - score::cpp::optional> ptr{}; + std::optional> ptr{}; std::ignore = proxy_event->Subscribe(max_num_samples); Result num_samples = proxy_event->GetNewSamples( [&ptr](SamplePtr new_sample) { diff --git a/score/mw/com/impl/handle_type.cpp b/score/mw/com/impl/handle_type.cpp index 0ffc425aa..d8502c1f6 100644 --- a/score/mw/com/impl/handle_type.cpp +++ b/score/mw/com/impl/handle_type.cpp @@ -26,7 +26,7 @@ namespace score::mw::com::impl namespace { -ServiceInstanceId ExtractInstanceId(score::cpp::optional instance_id, +ServiceInstanceId ExtractInstanceId(std::optional instance_id, const InstanceIdentifier& identifier) noexcept { if (instance_id.has_value()) @@ -50,7 +50,7 @@ ServiceInstanceId ExtractInstanceId(score::cpp::optional inst } // namespace -HandleType::HandleType(InstanceIdentifier identifier, score::cpp::optional instance_id) noexcept +HandleType::HandleType(InstanceIdentifier identifier, std::optional instance_id) noexcept : identifier_{std::move(identifier)}, instance_id_{ExtractInstanceId(instance_id, identifier_)} { } @@ -82,7 +82,7 @@ auto operator<(const HandleType& lhs, const HandleType& rhs) noexcept -> bool return std::tie(lhs.identifier_, lhs.instance_id_) < std::tie(rhs.identifier_, rhs.instance_id_); } -auto make_HandleType(InstanceIdentifier identifier, score::cpp::optional instance_id) noexcept +auto make_HandleType(InstanceIdentifier identifier, std::optional instance_id) noexcept -> HandleType { return HandleType(std::move(identifier), instance_id); diff --git a/score/mw/com/impl/handle_type.h b/score/mw/com/impl/handle_type.h index 76f28f79e..d855e5dec 100644 --- a/score/mw/com/impl/handle_type.h +++ b/score/mw/com/impl/handle_type.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/configuration/service_type_deployment.h" #include "score/mw/com/impl/instance_identifier.h" -#include +#include #include #include @@ -39,7 +39,7 @@ class HandleType; * \return A constructed InstanceIdentifier */ HandleType make_HandleType(InstanceIdentifier identifier, - score::cpp::optional instance_id = {}) noexcept; + std::optional instance_id = {}) noexcept; /** * \brief It types the handle for a specific service @@ -108,13 +108,13 @@ class HandleType InstanceIdentifier identifier_; ServiceInstanceId instance_id_; - explicit HandleType(InstanceIdentifier, score::cpp::optional instance_id) noexcept; + explicit HandleType(InstanceIdentifier, std::optional instance_id) noexcept; // Suppress "AUTOSAR C++14 A11-3-1", The rule states: "Friend declarations shall not be used". // Design decision: Friend class required to access private constructor. // This way more implementation details can be hidden from the user. // coverity[autosar_cpp14_a11_3_1_violation] - friend HandleType make_HandleType(InstanceIdentifier, score::cpp::optional instance_id) noexcept; + friend HandleType make_HandleType(InstanceIdentifier, std::optional instance_id) noexcept; }; } // namespace score::mw::com::impl diff --git a/score/mw/com/impl/instance_identifier.cpp b/score/mw/com/impl/instance_identifier.cpp index 8420b39e8..ce721720f 100644 --- a/score/mw/com/impl/instance_identifier.cpp +++ b/score/mw/com/impl/instance_identifier.cpp @@ -161,25 +161,25 @@ InstanceIdentifierView::InstanceIdentifierView(const InstanceIdentifier& identif // an exception. // This suppression should be removed after fixing [Ticket-173043](broken_link_j/Ticket-173043) // coverity[autosar_cpp14_a15_5_3_violation : FALSE] -auto InstanceIdentifierView::GetServiceInstanceId() const noexcept -> score::cpp::optional +auto InstanceIdentifierView::GetServiceInstanceId() const noexcept -> std::optional { auto visitor = score::cpp::overload( - [](const LolaServiceInstanceDeployment& deployment) -> score::cpp::optional { + [](const LolaServiceInstanceDeployment& deployment) -> std::optional { if (!deployment.instance_id_.has_value()) { return {}; } return ServiceInstanceId{*deployment.instance_id_}; }, - [](const SomeIpServiceInstanceDeployment& deployment) -> score::cpp::optional { + [](const SomeIpServiceInstanceDeployment& deployment) -> std::optional { if (!deployment.instance_id_.has_value()) { return {}; } return ServiceInstanceId{*deployment.instance_id_}; }, - [](const score::cpp::blank&) noexcept -> score::cpp::optional { - return score::cpp::optional{}; + [](const score::cpp::blank&) noexcept -> std::optional { + return std::optional{}; }); return std::visit(visitor, GetServiceInstanceDeployment().bindingInfo_); } diff --git a/score/mw/com/impl/instance_identifier.h b/score/mw/com/impl/instance_identifier.h index eb1e1487d..0da68d2ed 100644 --- a/score/mw/com/impl/instance_identifier.h +++ b/score/mw/com/impl/instance_identifier.h @@ -232,7 +232,7 @@ class InstanceIdentifierView final return identifier_.Serialize(); }; - score::cpp::optional GetServiceInstanceId() const noexcept; + std::optional GetServiceInstanceId() const noexcept; const ServiceInstanceDeployment& GetServiceInstanceDeployment() const noexcept; const ServiceTypeDeployment& GetServiceTypeDeployment() const; bool isCompatibleWith(const InstanceIdentifier&) const; diff --git a/score/mw/com/impl/methods/proxy_method_test.cpp b/score/mw/com/impl/methods/proxy_method_test.cpp index 4704c1e28..f49eeb4bc 100644 --- a/score/mw/com/impl/methods/proxy_method_test.cpp +++ b/score/mw/com/impl/methods/proxy_method_test.cpp @@ -97,7 +97,7 @@ class ProxyMethodTestFixture : public ::testing::Test make_ServiceIdentifierType("foo"), QualityType::kASIL_QM, LolaServiceTypeDeployment{42U}, - LolaServiceInstanceDeployment{1U}}; + LolaServiceInstanceDeployment{LolaServiceInstanceId{1U}}}; mock_binding::ProxyMethod proxy_method_binding_mock_; TestProxyBase proxy_base_{std::make_unique(), config_store_.GetHandle()}; diff --git a/score/mw/com/impl/mocking/BUILD b/score/mw/com/impl/mocking/BUILD index b339db401..ce5285083 100644 --- a/score/mw/com/impl/mocking/BUILD +++ b/score/mw/com/impl/mocking/BUILD @@ -79,7 +79,6 @@ cc_library( "//score/mw/com/impl:__subpackages__", ], deps = [ - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", ], ) @@ -110,7 +109,6 @@ cc_library( ], deps = [ "//score/mw/com/impl/plumbing:sample_allocatee_ptr", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", ], ) @@ -141,7 +139,6 @@ cc_library( ], deps = [ "//score/mw/com/impl/plumbing:sample_allocatee_ptr", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/result", ], ) diff --git a/score/mw/com/impl/mocking/test_type_utilities.cpp b/score/mw/com/impl/mocking/test_type_utilities.cpp index 17e71987e..0f6d79f4a 100644 --- a/score/mw/com/impl/mocking/test_type_utilities.cpp +++ b/score/mw/com/impl/mocking/test_type_utilities.cpp @@ -41,7 +41,7 @@ InstanceIdentifier MakeFakeInstanceIdentifier(const std::uint16_t unique_identif auto& type_deployment = service_type_deployments_.emplace_back(score::cpp::blank{}); auto& instance_deployment = service_instance_deployments_.emplace_back(std::move(service_identifier_type), - LolaServiceInstanceDeployment{unique_identifier}, + LolaServiceInstanceDeployment{LolaServiceInstanceId{unique_identifier}}, QualityType::kASIL_B, std::move(instance_specifier)); diff --git a/score/mw/com/impl/plumbing/BUILD b/score/mw/com/impl/plumbing/BUILD index 86f8d29c4..1c9e89f1e 100644 --- a/score/mw/com/impl/plumbing/BUILD +++ b/score/mw/com/impl/plumbing/BUILD @@ -28,7 +28,6 @@ cc_library( ":sample_allocatee_ptr", ":sample_ptr", ":skeleton_binding_factory", - "@score_baselibs//score/language/futurecpp", ], ) @@ -60,7 +59,6 @@ cc_library( deps = [ "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:skeleton_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -142,7 +140,6 @@ cc_library( "//score/mw/com/impl:handle_type", "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_binding", - "@score_baselibs//score/language/futurecpp", ], ) @@ -158,7 +155,6 @@ cc_library( deps = [ "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -174,7 +170,6 @@ cc_library( deps = [ "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -191,7 +186,6 @@ cc_library( "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_base", "//score/mw/com/impl/methods:proxy_method_binding", - "@score_baselibs//score/language/futurecpp", ], ) @@ -223,7 +217,6 @@ cc_library( deps = [ "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:skeleton_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -239,7 +232,6 @@ cc_library( deps = [ "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:skeleton_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -380,7 +372,6 @@ cc_library( deps = [ ":i_skeleton_field_binding_factory", ":skeleton_service_element_binding_factory_impl", - "@score_baselibs//score/language/futurecpp", ], ) @@ -395,7 +386,6 @@ cc_library( tags = ["FFI"], deps = [ ":i_proxy_binding_factory", - "@score_baselibs//score/language/futurecpp", ], ) @@ -478,7 +468,6 @@ cc_library( deps = [ "skeleton_field_binding_factory_impl", ":i_skeleton_field_binding_factory", - "@score_baselibs//score/language/futurecpp", ], ) @@ -630,7 +619,6 @@ cc_library( "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_base", "//score/mw/com/impl:skeleton_base", - "@score_baselibs//score/language/futurecpp", ], ) @@ -652,7 +640,6 @@ cc_library( "//score/mw/com/impl:instance_identifier", "//score/mw/com/impl:proxy_base", "//score/mw/com/impl:skeleton_base", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/impl/plumbing/binding_runtime_factory.cpp b/score/mw/com/impl/plumbing/binding_runtime_factory.cpp index 0b8deae7c..4aa769574 100644 --- a/score/mw/com/impl/plumbing/binding_runtime_factory.cpp +++ b/score/mw/com/impl/plumbing/binding_runtime_factory.cpp @@ -27,7 +27,7 @@ std::unordered_map& tracing_filter_config) + const std::optional& tracing_filter_config) { std::unordered_map> result{}; diff --git a/score/mw/com/impl/plumbing/binding_runtime_factory.h b/score/mw/com/impl/plumbing/binding_runtime_factory.h index 367b6278e..9a88968e4 100644 --- a/score/mw/com/impl/plumbing/binding_runtime_factory.h +++ b/score/mw/com/impl/plumbing/binding_runtime_factory.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/i_binding_runtime.h" #include "score/mw/com/impl/tracing/configuration/tracing_filter_config.h" -#include +#include #include "score/concurrency/executor.h" @@ -34,7 +34,7 @@ class BindingRuntimeFactory final static std::unordered_map> CreateBindingRuntimes( Configuration& configuration, concurrency::Executor& long_running_threads, - const score::cpp::optional& tracing_filter_config); + const std::optional& tracing_filter_config); }; } // namespace score::mw::com::impl diff --git a/score/mw/com/impl/plumbing/proxy_binding_factory.h b/score/mw/com/impl/plumbing/proxy_binding_factory.h index 111732b85..e62276b72 100644 --- a/score/mw/com/impl/plumbing/proxy_binding_factory.h +++ b/score/mw/com/impl/plumbing/proxy_binding_factory.h @@ -20,7 +20,7 @@ #include "score/result/result.h" -#include +#include #include #include diff --git a/score/mw/com/impl/plumbing/proxy_binding_factory_test.cpp b/score/mw/com/impl/plumbing/proxy_binding_factory_test.cpp index 6d6bc791f..fc0c62e6f 100644 --- a/score/mw/com/impl/plumbing/proxy_binding_factory_test.cpp +++ b/score/mw/com/impl/plumbing/proxy_binding_factory_test.cpp @@ -77,14 +77,14 @@ class SkeletonBindingGuard }; using ProxyBindingFactoryCreateFixture = lola::ProxyMockedMemoryFixture; -score::cpp::optional GetInstanceId(score::mw::com::impl::InstanceIdentifier identifier) +std::optional GetInstanceId(score::mw::com::impl::InstanceIdentifier identifier) { const InstanceIdentifierView identifier_view{identifier}; const auto* const instance_deployment = std::get_if(&identifier_view.GetServiceInstanceDeployment().bindingInfo_); if (instance_deployment == nullptr) { - return score::cpp::nullopt; + return std::nullopt; } return instance_deployment->instance_id_; } diff --git a/score/mw/com/impl/proxy_event_base_test.cpp b/score/mw/com/impl/proxy_event_base_test.cpp index 7ef7983a0..2b3d480ed 100644 --- a/score/mw/com/impl/proxy_event_base_test.cpp +++ b/score/mw/com/impl/proxy_event_base_test.cpp @@ -937,7 +937,7 @@ TYPED_TEST(ProxyEventBaseGetFreeSampleCountFixture, GetFreeSampleCountReturnsCou EXPECT_EQ(received_free_sample_count, free_sample_count); // and when allocating 2 additional slots - score::cpp::optional tracker_guard_factory{tracker.Allocate(2)}; + std::optional tracker_guard_factory{tracker.Allocate(2)}; // and when calling GetFreeSampleCount // Then the free sample count should be updated diff --git a/score/mw/com/impl/proxy_event_test.cpp b/score/mw/com/impl/proxy_event_test.cpp index d6b24f899..f839869da 100644 --- a/score/mw/com/impl/proxy_event_test.cpp +++ b/score/mw/com/impl/proxy_event_test.cpp @@ -265,7 +265,7 @@ TYPED_TEST(ProxyEventDeathTest, DieOnUnsubscribingWhileHoldingSamplePtrs) EXPECT_CALL(Base::mock_proxy_event_, GetSubscriptionState()) .WillOnce(::testing::Return(SubscriptionState::kNotSubscribed)); - score::cpp::optional> ptr{}; + std::optional> ptr{}; std::ignore = Base::proxy_event_.Subscribe(max_num_samples); Result num_samples = Base::proxy_event_.GetNewSamples( [&ptr](SamplePtr new_sample) { @@ -489,7 +489,7 @@ TEST(ProxyEventDeathTest, DieOnProxyDestructionWhileHoldingSamplePtrs) mock_proxy.PushFakeSample(3U); EXPECT_CALL(mock_proxy, GetSubscriptionState()).WillOnce(::testing::Return(SubscriptionState::kNotSubscribed)); - score::cpp::optional> ptr{}; + std::optional> ptr{}; std::ignore = proxy->Subscribe(max_num_samples); Result num_samples = proxy->GetNewSamples( [&ptr](SamplePtr new_sample) { diff --git a/score/mw/com/impl/runtime.cpp b/score/mw/com/impl/runtime.cpp index 25e722337..286342e2f 100644 --- a/score/mw/com/impl/runtime.cpp +++ b/score/mw/com/impl/runtime.cpp @@ -79,7 +79,7 @@ namespace score::mw::com::impl using TracingFilterConfig = tracing::TracingFilterConfig; IRuntime* Runtime::mock_ = nullptr; -score::cpp::optional Runtime::initialization_config_{}; +std::optional Runtime::initialization_config_{}; bool Runtime::runtime_initialization_locked_{false}; std::mutex score::mw::com::impl::Runtime::mutex_{}; @@ -87,7 +87,7 @@ std::mutex score::mw::com::impl::Runtime::mutex_{}; namespace { -score::cpp::optional ParseTraceConfig(const Configuration& configuration) +std::optional ParseTraceConfig(const Configuration& configuration) { if (!configuration.GetTracingConfiguration().IsTracingEnabled()) { @@ -148,7 +148,7 @@ Runtime& Runtime::getInstanceInternal() noexcept // Suppress "AUTOSAR C++14 A3-3-2" rule finding. This rule states: "Static and thread-local objects shall be // constant-initialized.". This cannot be constexpr as the lambda function executes at runtime. // coverity[autosar_cpp14_a3_3_2_violation] - static Runtime instance{([]() -> std::pair> { + static Runtime instance{([]() -> std::pair> { std::lock_guard lock{mutex_}; runtime_initialization_locked_ = true; if (!initialization_config_.has_value()) @@ -170,7 +170,7 @@ Runtime& Runtime::getInstanceInternal() noexcept return instance; } -Runtime::Runtime(std::pair&&> configs) +Runtime::Runtime(std::pair&&> configs) : IRuntime{}, configuration_{std::move(std::get<0>(configs))}, tracing_filter_configuration_{std::move(std::get<1>(configs))}, diff --git a/score/mw/com/impl/runtime.h b/score/mw/com/impl/runtime.h index 24adf4598..84d42c864 100644 --- a/score/mw/com/impl/runtime.h +++ b/score/mw/com/impl/runtime.h @@ -25,12 +25,12 @@ #include "score/mw/com/runtime_configuration.h" #include -#include #include #include #include #include +#include #include #include @@ -86,7 +86,7 @@ class Runtime final : public IRuntime /// impl::Runtime isn't user facing and just internally used. Having a public ctor eases life /// in so many places! /// \param config configuration, which was build up during Runtime::Initialize(). - explicit Runtime(std::pair&&> configs); + explicit Runtime(std::pair&&> configs); /// \brief Runtime is not copyable/copy-assignable since it shall have singleton semantic. Runtime(const Runtime&) = delete; @@ -142,7 +142,7 @@ class Runtime final : public IRuntime /// \brief static configuration set by one of the static Initialize() overloads. Will then finally get moved into /// the singleton instance member configuration_. - static score::cpp::optional initialization_config_; + static std::optional initialization_config_; /// \brief configuration Configuration configuration_; @@ -151,7 +151,7 @@ class Runtime final : public IRuntime /// /// Will be filled only if tracing is enabled in the configuration_ and the tracing json file can be found and /// successfully parsed. - score::cpp::optional tracing_filter_configuration_; + std::optional tracing_filter_configuration_; /// \brief Runtimes for specific bindings (e.g. LoLa, SomeIP etc.) std::unordered_map> binding_runtimes_; diff --git a/score/mw/com/impl/runtime_test.cpp b/score/mw/com/impl/runtime_test.cpp index f00871af0..7347e7d97 100644 --- a/score/mw/com/impl/runtime_test.cpp +++ b/score/mw/com/impl/runtime_test.cpp @@ -29,11 +29,11 @@ #include "score/analysis/tracing/generic_trace_library/mock/trace_library_mock.h" #include -#include #include #include #include +#include #include #include #include @@ -52,7 +52,7 @@ TEST(RuntimeTest, CanRetrieveServiceDiscovery) Configuration::ServiceInstanceDeployments{}, GlobalConfiguration{}, TracingConfiguration{}}; - score::cpp::optional empty_filter_configuration{}; + std::optional empty_filter_configuration{}; Runtime runtime{std::make_pair(std::move(dummy_configuration), std::move(empty_filter_configuration))}; score::cpp::ignore = runtime.GetServiceDiscovery(); } @@ -125,7 +125,7 @@ class RuntimeFixture : public ::testing::Test return lola_tracing_runtime->GetTraceClientId(); } - score::cpp::optional trace_filter_config_{}; + std::optional trace_filter_config_{}; std::unique_ptr configuration_{nullptr}; std::unique_ptr runtime_{nullptr}; diff --git a/score/mw/com/impl/sample_reference_tracker.h b/score/mw/com/impl/sample_reference_tracker.h index 6f9e9146b..e57601a6d 100644 --- a/score/mw/com/impl/sample_reference_tracker.h +++ b/score/mw/com/impl/sample_reference_tracker.h @@ -44,13 +44,13 @@ class TrackerGuardFactory final ~TrackerGuardFactory() noexcept; /// Returns the number of available guards, i.e. the number of times TakeGuard() can be called without getting an - /// score::cpp::nullopt. + /// std::nullopt. /// /// \return Number of guards available. std::size_t GetNumAvailableGuards() const noexcept; /// Creates one SampleReferenceGuard, reducing the number of reserved references by one. If no references are left, - /// it will return score::cpp::nullopt. + /// it will return std::nullopt. /// /// \return A guard managing a single reference, std::nullopt otherwise. std::optional TakeGuard() noexcept; diff --git a/score/mw/com/impl/service_discovery_test.cpp b/score/mw/com/impl/service_discovery_test.cpp index 7ebc23602..a1db0cbbf 100644 --- a/score/mw/com/impl/service_discovery_test.cpp +++ b/score/mw/com/impl/service_discovery_test.cpp @@ -28,11 +28,11 @@ #include "score/result/result.h" -#include #include #include #include +#include #include #include @@ -508,8 +508,8 @@ TEST_F(ServiceDiscoveryStartFindServiceInstanceSpecifierFixture, WithAServiceContainingTwoInstances(); // Expecting that StartFindService will be called on the binding for each InstanceIdentifier - score::cpp::optional find_service_handle_1{}; - score::cpp::optional find_service_handle_2{}; + std::optional find_service_handle_1{}; + std::optional find_service_handle_2{}; ON_CALL(service_discovery_client_, StartFindService(_, _, config_stores_[0].GetEnrichedInstanceIdentifier())) .WillByDefault(DoAll(SaveArg<0>(&find_service_handle_1), Return(ResultBlank{}))); ON_CALL(service_discovery_client_, StartFindService(_, _, config_stores_[1].GetEnrichedInstanceIdentifier())) diff --git a/score/mw/com/impl/skeleton_base.cpp b/score/mw/com/impl/skeleton_base.cpp index 6ddb15af1..0431ed321 100644 --- a/score/mw/com/impl/skeleton_base.cpp +++ b/score/mw/com/impl/skeleton_base.cpp @@ -319,7 +319,7 @@ auto SkeletonBase::AreBindingsValid() const noexcept -> bool return is_skeleton_binding_valid && are_service_element_bindings_valid; } -score::cpp::optional GetInstanceIdentifier(const InstanceSpecifier& specifier) +std::optional GetInstanceIdentifier(const InstanceSpecifier& specifier) { const auto instance_identifiers = Runtime::getInstance().resolve(specifier); if (instance_identifiers.size() != static_cast(1U)) diff --git a/score/mw/com/impl/skeleton_base.h b/score/mw/com/impl/skeleton_base.h index 45f4d108f..fad95a1ad 100644 --- a/score/mw/com/impl/skeleton_base.h +++ b/score/mw/com/impl/skeleton_base.h @@ -26,13 +26,13 @@ #include "score/mw/log/logging.h" #include -#include #include #include #include #include #include +#include #include namespace score::mw::com::impl @@ -217,7 +217,7 @@ class SkeletonBaseView SkeletonBase& skeleton_base_; }; -score::cpp::optional GetInstanceIdentifier(const InstanceSpecifier& specifier); +std::optional GetInstanceIdentifier(const InstanceSpecifier& specifier); } // namespace score::mw::com::impl diff --git a/score/mw/com/impl/skeleton_binding.h b/score/mw/com/impl/skeleton_binding.h index ca923dbfc..c59c8b251 100644 --- a/score/mw/com/impl/skeleton_binding.h +++ b/score/mw/com/impl/skeleton_binding.h @@ -19,10 +19,10 @@ #include "score/result/result.h" #include -#include #include #include +#include #include namespace score::mw::com::impl diff --git a/score/mw/com/impl/skeleton_event_binding.h b/score/mw/com/impl/skeleton_event_binding.h index 7255ab8f1..02db180af 100644 --- a/score/mw/com/impl/skeleton_event_binding.h +++ b/score/mw/com/impl/skeleton_event_binding.h @@ -20,10 +20,10 @@ #include "score/result/result.h" #include -#include #include #include +#include namespace score::mw::com::impl { @@ -78,12 +78,12 @@ class SkeletonEventBinding : public SkeletonEventBindingBase /// \brief SampleType is allocated by the user and provided to the middleware to send /// \return On failure, returns an error code. - virtual ResultBlank Send(const SampleType&, score::cpp::optional) noexcept = 0; + virtual ResultBlank Send(const SampleType&, std::optional) noexcept = 0; /// \brief SampleType is previously allocated by middleware and provided by the user to indicate that he is finished /// filling the provided pointer with live. /// \return On failure, returns an error code. - virtual ResultBlank Send(SampleAllocateePtr, score::cpp::optional) noexcept = 0; + virtual ResultBlank Send(SampleAllocateePtr, std::optional) noexcept = 0; /// \brief Allocates memory for SampleType for the user to fill it. This is especially necessary for Zero-Copy /// implementations. diff --git a/score/mw/com/impl/skeleton_event_binding_test.cpp b/score/mw/com/impl/skeleton_event_binding_test.cpp index cb32d56e1..809f31f90 100644 --- a/score/mw/com/impl/skeleton_event_binding_test.cpp +++ b/score/mw/com/impl/skeleton_event_binding_test.cpp @@ -34,13 +34,13 @@ class MyEvent final : public SkeletonEventBinding void PrepareStopOffer() noexcept override {} ResultBlank Send( const SampleType&, - score::cpp::optional::SendTraceCallback>) noexcept override + std::optional::SendTraceCallback>) noexcept override { return {}; } ResultBlank Send( SampleAllocateePtr, - score::cpp::optional::SendTraceCallback>) noexcept override + std::optional::SendTraceCallback>) noexcept override { return {}; } diff --git a/score/mw/com/impl/test/BUILD b/score/mw/com/impl/test/BUILD index 9206f01d2..1995021c4 100644 --- a/score/mw/com/impl/test/BUILD +++ b/score/mw/com/impl/test/BUILD @@ -32,7 +32,6 @@ cc_library( "//score/mw/com/impl/plumbing:skeleton_event_binding_factory_mock", "//score/mw/com/impl/plumbing:skeleton_field_binding_factory_mock", "//score/mw/com/impl/plumbing:skeleton_method_binding_factory_mock", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/impl/tracing/BUILD b/score/mw/com/impl/tracing/BUILD index b06dc85d5..a30c2c526 100644 --- a/score/mw/com/impl/tracing/BUILD +++ b/score/mw/com/impl/tracing/BUILD @@ -121,7 +121,6 @@ cc_library( "//score/mw/com/impl:skeleton_event_base", "//score/mw/com/impl:skeleton_field_base", "//score/mw/com/impl/tracing/configuration:service_element_instance_identifier_view", - "@score_baselibs//score/language/futurecpp", ], ) @@ -197,7 +196,6 @@ cc_library( "//score/mw/com/impl/tracing/configuration:service_element_instance_identifier_view", "//score/mw/com/impl/tracing/configuration:skeleton_event_trace_point_type", "//score/mw/com/impl/tracing/configuration:skeleton_field_trace_point_type", - "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/memory/shared:i_shared_memory_resource", ], ) @@ -287,7 +285,6 @@ cc_gtest_unit_test( features = COMPILER_WARNING_FEATURES, deps = [ ":type_erased_sample_ptr", - "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/mw/com/impl/tracing/common_event_tracing.cpp b/score/mw/com/impl/tracing/common_event_tracing.cpp index 26a145299..4060968bb 100644 --- a/score/mw/com/impl/tracing/common_event_tracing.cpp +++ b/score/mw/com/impl/tracing/common_event_tracing.cpp @@ -46,7 +46,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element const TracingRuntime::TracePointType trace_point, const BindingType binding_type, const std::pair& local_data_chunk, - const score::cpp::optional trace_point_data_id) noexcept + const std::optional trace_point_data_id) noexcept { auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime(); SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(tracing_runtime != nullptr); diff --git a/score/mw/com/impl/tracing/common_event_tracing.h b/score/mw/com/impl/tracing/common_event_tracing.h index 4f59bccd4..e6bf015f2 100644 --- a/score/mw/com/impl/tracing/common_event_tracing.h +++ b/score/mw/com/impl/tracing/common_event_tracing.h @@ -18,7 +18,7 @@ #include "score/mw/com/impl/tracing/configuration/service_element_instance_identifier_view.h" #include "score/mw/com/impl/tracing/tracing_runtime.h" -#include +#include #include #include @@ -39,7 +39,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element const TracingRuntime::TracePointType trace_point, const BindingType binding_type, const std::pair& local_data_chunk = {nullptr, 0U}, - const score::cpp::optional trace_point_data_id = {}) noexcept; + const std::optional trace_point_data_id = {}) noexcept; ResultBlank TraceShmData(const BindingType binding_type, const ServiceElementTracingData service_element_tracing_data, diff --git a/score/mw/com/impl/tracing/common_event_tracing_test.cpp b/score/mw/com/impl/tracing/common_event_tracing_test.cpp index 019289129..8d233d3b5 100644 --- a/score/mw/com/impl/tracing/common_event_tracing_test.cpp +++ b/score/mw/com/impl/tracing/common_event_tracing_test.cpp @@ -22,13 +22,13 @@ #include "score/result/result.h" -#include #include #include #include #include #include +#include #include #include @@ -119,7 +119,7 @@ TEST_F(CommonEventTracingLocalTraceDataFixture, CallingTraceDataWillDispatchToBi Trace(binding_type_, service_element_instance_identifier_view_, trace_point_, - score::cpp::optional{trace_point_data_id_}, + std::optional{trace_point_data_id_}, local_data_chunk_.first, local_data_chunk_.second)); diff --git a/score/mw/com/impl/tracing/configuration/tracing_filter_config_test.cpp b/score/mw/com/impl/tracing/configuration/tracing_filter_config_test.cpp index 545a7ef82..1f53f6fc4 100644 --- a/score/mw/com/impl/tracing/configuration/tracing_filter_config_test.cpp +++ b/score/mw/com/impl/tracing/configuration/tracing_filter_config_test.cpp @@ -33,7 +33,7 @@ const std::string kEventName{"my_event_name"}; const std::string kFieldName{"my_field_name"}; const auto kInstanceSpecifiersv = "abc/abc/TirePressurePort"sv; const ITracingFilterConfig::InstanceSpecifierView kInstanceSpecifierView{"my_instance_specifier"}; -const score::cpp::optional kEnableAllInstanceSpecifiers{}; +const std::optional kEnableAllInstanceSpecifiers{}; constexpr auto kDummyTracePointType = SkeletonEventTracePointType::SEND; // Trace point type constants @@ -705,7 +705,7 @@ class ConfigurationFixture : public ::testing::Test PrepareMinimalConfiguration(valid_instance_specifier, service_type_, events, fields); } - score::cpp::optional configuration_{}; + std::optional configuration_{}; TracingFilterConfig tracing_filter_config_{}; const std::string_view service_type_ = "/score/ncar/services/TirePressureService"; const std::string event_name_ = "CurrentPressureFrontLeft"; diff --git a/score/mw/com/impl/tracing/i_binding_tracing_runtime.h b/score/mw/com/impl/tracing/i_binding_tracing_runtime.h index 07d3d8f4d..683e3b0df 100644 --- a/score/mw/com/impl/tracing/i_binding_tracing_runtime.h +++ b/score/mw/com/impl/tracing/i_binding_tracing_runtime.h @@ -21,9 +21,9 @@ #include "score/mw/com/impl/tracing/type_erased_sample_ptr.h" #include -#include #include +#include namespace score::mw::com::impl::tracing { @@ -84,10 +84,10 @@ class IBindingTracingRuntime virtual void UnregisterShmObject(const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) noexcept = 0; - virtual score::cpp::optional GetShmObjectHandle( + virtual std::optional GetShmObjectHandle( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept = 0; - virtual score::cpp::optional GetShmRegionStartAddress( + virtual std::optional GetShmRegionStartAddress( const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept = 0; @@ -95,7 +95,7 @@ class IBindingTracingRuntime const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view, const memory::shared::ISharedMemoryResource::FileDescriptor shm_file_descriptor, void* const shm_memory_start_address) noexcept = 0; - virtual score::cpp::optional> + virtual std::optional> GetCachedFileDescriptorForReregisteringShmObject(const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept = 0; virtual void ClearCachedFileDescriptorForReregisteringShmObject( diff --git a/score/mw/com/impl/tracing/i_tracing_runtime.h b/score/mw/com/impl/tracing/i_tracing_runtime.h index f06c8a8b8..e8a432cb9 100644 --- a/score/mw/com/impl/tracing/i_tracing_runtime.h +++ b/score/mw/com/impl/tracing/i_tracing_runtime.h @@ -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 trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept = 0; diff --git a/score/mw/com/impl/tracing/skeleton_event_tracing.h b/score/mw/com/impl/tracing/skeleton_event_tracing.h index 87f0bf091..630134eee 100644 --- a/score/mw/com/impl/tracing/skeleton_event_tracing.h +++ b/score/mw/com/impl/tracing/skeleton_event_tracing.h @@ -26,7 +26,7 @@ #include "score/mw/com/impl/tracing/configuration/service_element_instance_identifier_view.h" #include "score/mw/com/impl/tracing/skeleton_event_tracing_data.h" -#include +#include #include #include @@ -249,9 +249,9 @@ void TraceSendWithAllocate(SkeletonEventTracingData& skeleton_event_tracing_data template auto CreateTracingSendCallback(SkeletonEventTracingData& skeleton_event_tracing_data, const SkeletonEventBindingBase& skeleton_event_binding_base) noexcept - -> score::cpp::optional::SendTraceCallback> + -> std::optional::SendTraceCallback> { - score::cpp::optional::SendTraceCallback> tracing_handler{}; + std::optional::SendTraceCallback> tracing_handler{}; if (skeleton_event_tracing_data.enable_send) { tracing_handler = [&skeleton_event_tracing_data, &skeleton_event_binding_base]( @@ -265,9 +265,9 @@ auto CreateTracingSendCallback(SkeletonEventTracingData& skeleton_event_tracing_ template auto CreateTracingSendWithAllocateCallback(SkeletonEventTracingData& skeleton_event_tracing_data, const SkeletonEventBindingBase& skeleton_event_binding_base) noexcept - -> score::cpp::optional::SendTraceCallback> + -> std::optional::SendTraceCallback> { - score::cpp::optional::SendTraceCallback> tracing_handler{}; + std::optional::SendTraceCallback> tracing_handler{}; if (skeleton_event_tracing_data.enable_send_with_allocate) { tracing_handler = [&skeleton_event_tracing_data, &skeleton_event_binding_base]( diff --git a/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp b/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp index 4bca132f6..f60c68d40 100644 --- a/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp +++ b/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp @@ -469,7 +469,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, SubscribeCallsAreTracedWhenEnabled Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -539,7 +539,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -617,7 +617,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -733,7 +733,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, UnsubscribeCallsAreTracedWhenEna Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(ResultBlank{})); @@ -794,7 +794,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -863,7 +863,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -969,7 +969,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, SetReceiveHandlerCallsAreT Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(ResultBlank{})); @@ -1026,7 +1026,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1090,7 +1090,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1198,7 +1198,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, ReceiveHandlerCallbac Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1266,7 +1266,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1342,7 +1342,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1456,7 +1456,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, UnsetReceiveHandlerCalls Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1515,7 +1515,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1582,7 +1582,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1689,7 +1689,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, GetNewSamplesCallsAreTracedWhe Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1743,7 +1743,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1806,7 +1806,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); diff --git a/score/mw/com/impl/tracing/test/skeleton_event_tracing_test.cpp b/score/mw/com/impl/tracing/test/skeleton_event_tracing_test.cpp index 836560864..df2ac6da9 100644 --- a/score/mw/com/impl/tracing/test/skeleton_event_tracing_test.cpp +++ b/score/mw/com/impl/tracing/test/skeleton_event_tracing_test.cpp @@ -280,10 +280,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendCallsAreTracedWhenEnabled) EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -367,10 +367,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendTracePointShouldBeDisabledAfterTrace EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -457,10 +457,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendTracePointShouldBeDisabledAfterTrace EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -542,10 +542,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendCallsAreNotTracedWhenDisabled) EXPECT_CALL(*mock_skeleton_event_binding_, GetBindingType()).WillOnce(Return(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -591,10 +591,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendCallsAreNotTracedWhenTracingFilterCo // and that the SkeletonEvent binding never checks which trace points are enabled // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -643,10 +643,10 @@ TEST_F(SkeletonEventTracingSendFixture, SendCallsAreNotTracedWhenTracingRuntimeC // and that the SkeletonEvent binding never checks which trace points are enabled // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -715,10 +715,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, SendCallsAreTracedWhenEnable .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -813,10 +813,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -914,10 +914,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1009,10 +1009,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenDis .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1068,10 +1068,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenTra .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1130,10 +1130,10 @@ TEST_F(SkeletonEventTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenTra .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_event_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; diff --git a/score/mw/com/impl/tracing/test/skeleton_field_tracing_test.cpp b/score/mw/com/impl/tracing/test/skeleton_field_tracing_test.cpp index 480081692..974316b59 100644 --- a/score/mw/com/impl/tracing/test/skeleton_field_tracing_test.cpp +++ b/score/mw/com/impl/tracing/test/skeleton_field_tracing_test.cpp @@ -287,10 +287,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendCallsAreTracedWhenEnabled) EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -377,10 +377,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendTracePointShouldBeDisabledAfterTrace EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -470,10 +470,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendTracePointShouldBeDisabledAfterTrace EXPECT_CALL(tracing_runtime_mock, RegisterServiceElement(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -558,10 +558,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendCallsAreNotTracedWhenDisabled) EXPECT_CALL(*mock_skeleton_field_binding_, GetBindingType()).WillOnce(Return(BindingType::kLoLa)); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -610,10 +610,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendCallsAreNotTracedWhenTracingFilterCo // and that the SkeletonEvent binding never checks which trace points are enabled // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -665,10 +665,10 @@ TEST_F(SkeletonFieldTracingSendFixture, SendCallsAreNotTracedWhenTracingRuntimeC // and that the SkeletonEvent binding never checks which trace points are enabled // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(sample_data, _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -740,10 +740,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, SendCallsAreTracedWhenEnable .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -849,10 +849,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -961,10 +961,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1067,10 +1067,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenDis .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1136,10 +1136,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenTra .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; @@ -1208,10 +1208,10 @@ TEST_F(SkeletonFieldTracingSendWithAllocateFixture, SendCallsAreNotTracedWhenTra .WillOnce(Return(ByMove(MakeSampleAllocateePtr(std::make_unique())))); // and that Send will be called on the binding with the wrapped handler containing the trace call - score::cpp::optional::SendTraceCallback> send_trace_callback_result{}; + std::optional::SendTraceCallback> send_trace_callback_result{}; EXPECT_CALL(*mock_skeleton_field_binding_, Send(An>(), _)) .WillOnce(WithArgs<1>(Invoke( - [&send_trace_callback_result](score::cpp::optional::SendTraceCallback> + [&send_trace_callback_result](std::optional::SendTraceCallback> provided_send_trace_callback) -> ResultBlank { send_trace_callback_result = std::move(provided_send_trace_callback); return {}; diff --git a/score/mw/com/impl/tracing/test/skeleton_tracing_test.cpp b/score/mw/com/impl/tracing/test/skeleton_tracing_test.cpp index 8e3c314fd..ec5e4a6d6 100644 --- a/score/mw/com/impl/tracing/test/skeleton_tracing_test.cpp +++ b/score/mw/com/impl/tracing/test/skeleton_tracing_test.cpp @@ -322,11 +322,11 @@ TEST_F(SkeletonBaseUnregisterShmTracingFixture, UnregisterShmObjectIsTracedIfTra // and that PrepareStopOffer will be called on the binding with the wrapped handler containing the unregister shm // object trace call - score::cpp::optional + std::optional unregister_shm_object_trace_callback_result{}; EXPECT_CALL(*binding_mock_, PrepareStopOffer(_)) .WillOnce(Invoke([&unregister_shm_object_trace_callback_result]( - score::cpp::optional + std::optional provided_unregister_shm_object_trace_callback_result) -> ResultBlank { unregister_shm_object_trace_callback_result = std::move(provided_unregister_shm_object_trace_callback_result); @@ -382,11 +382,11 @@ TEST_F(SkeletonBaseUnregisterShmTracingFixture, UnregisterShmObjectIsNotTracedIf // and that PrepareStopOffer will be called on the binding with the wrapped handler containing the unregister shm // object trace call - score::cpp::optional + std::optional unregister_shm_object_trace_callback_result{}; EXPECT_CALL(*binding_mock_, PrepareStopOffer(_)) .WillOnce(Invoke([&unregister_shm_object_trace_callback_result]( - score::cpp::optional + std::optional provided_unregister_shm_object_trace_callback_result) -> ResultBlank { unregister_shm_object_trace_callback_result = std::move(provided_unregister_shm_object_trace_callback_result); @@ -447,7 +447,7 @@ TEST_F(SkeletonBaseUnregisterShmTracingFixture, UnregisterShmObjectIsTracedOnDes // and that PrepareStopOffer will be called on the binding with the wrapped handler containing the unregister shm // object trace call EXPECT_CALL(*binding_mock_, PrepareStopOffer(_)) - .WillOnce(Invoke([](score::cpp::optional + .WillOnce(Invoke([](std::optional provided_unregister_shm_object_trace_callback_result) -> ResultBlank { // Expect that the unregister shm object tracing callback is not empty EXPECT_TRUE(provided_unregister_shm_object_trace_callback_result.has_value()); @@ -504,7 +504,7 @@ TEST_F(SkeletonBaseUnregisterShmTracingFixture, // and that PrepareStopOffer will be called on the binding with the wrapped handler containing the unregister shm // object trace call EXPECT_CALL(*binding_mock_, PrepareStopOffer(_)) - .WillOnce(Invoke([](score::cpp::optional + .WillOnce(Invoke([](std::optional provided_unregister_shm_object_trace_callback_result) -> ResultBlank { // Expect that the unregister shm object tracing callback is empty EXPECT_FALSE(provided_unregister_shm_object_trace_callback_result.has_value()); diff --git a/score/mw/com/impl/tracing/tracing_runtime.cpp b/score/mw/com/impl/tracing/tracing_runtime.cpp index 32b524645..1d85ec184 100644 --- a/score/mw/com/impl/tracing/tracing_runtime.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime.cpp @@ -20,6 +20,7 @@ #include "score/mw/com/impl/tracing/trace_error.h" #include +#include #include #include @@ -172,14 +173,19 @@ analysis::tracing::TracePointType InternalToExternalTracePointType( analysis::tracing::AraComMetaInfo CreateMetaInfo( const ServiceElementInstanceIdentifierView& service_element_instance_identifier, const TracingRuntime::TracePointType& trace_point_type, - const score::cpp::optional trace_point_data_id, + const std::optional trace_point_data_id, const IBindingTracingRuntime& binding_runtime) noexcept { const analysis::tracing::TracePointType ext_trace_point_type = InternalToExternalTracePointType(trace_point_type); + + // TODO The following convertion can be removed once base lib analysis tracing has been migrated to use std::optional + const auto score_opt_trace_point_data_id = trace_point_data_id.has_value() + ? score::cpp::make_optional(trace_point_data_id.value()) : score::cpp::nullopt; + analysis::tracing::AraComMetaInfo result{analysis::tracing::AraComProperties( ext_trace_point_type, binding_runtime.ConvertToTracingServiceInstanceElement(service_element_instance_identifier), - trace_point_data_id)}; + score_opt_trace_point_data_id)}; if (binding_runtime.GetDataLossFlag()) { result.SetDataLossBit(); @@ -602,7 +608,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 trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept { diff --git a/score/mw/com/impl/tracing/tracing_runtime.h b/score/mw/com/impl/tracing/tracing_runtime.h index d350e9b5b..63985af80 100644 --- a/score/mw/com/impl/tracing/tracing_runtime.h +++ b/score/mw/com/impl/tracing/tracing_runtime.h @@ -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 trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept override; diff --git a/score/mw/com/impl/tracing/tracing_runtime_mock.h b/score/mw/com/impl/tracing/tracing_runtime_mock.h index 89629bcdf..16b934a2a 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_mock.h +++ b/score/mw/com/impl/tracing/tracing_runtime_mock.h @@ -49,7 +49,7 @@ class TracingRuntimeMock : public ITracingRuntime (BindingType, ServiceElementInstanceIdentifierView, TracePointType, - score::cpp::optional, + std::optional, const void*, std::size_t), (noexcept, override)); diff --git a/score/mw/com/impl/tracing/tracing_runtime_test.cpp b/score/mw/com/impl/tracing/tracing_runtime_test.cpp index befe3b750..17b1b353c 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_test.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime_test.cpp @@ -163,7 +163,7 @@ TEST(TracingRuntime, TracingRuntimeTraceWillReceivePointerToConstShmData) score::mw::com::impl::tracing::TracingRuntime::*)(BindingType, ServiceElementInstanceIdentifierView, ITracingRuntime::TracePointType, - score::cpp::optional, + std::optional, ShmPointerType, std::size_t)>(&TracingRuntime::Trace); static_assert(std::is_member_function_pointer_v, @@ -449,7 +449,7 @@ TEST_F(TracingRuntimeUnregisterShmObjectFixture, // and that UuT calls GetShmObjectHandle on the binding specific tracing runtime, which returns an empty optional ON_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillByDefault(Return(score::cpp::optional{})); + .WillByDefault(Return(std::optional{})); // Expecting that UuT calls ClearCachedFileDescriptorForReregisteringShmObject on the binding specific tracing // runtime @@ -467,7 +467,7 @@ TEST_F(TracingRuntimeUnregisterShmObjectFixture, // and that UuT calls GetShmObjectHandle on the binding specific tracing runtime, which returns an empty optional ON_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillByDefault(Return(score::cpp::optional{})); + .WillByDefault(Return(std::optional{})); // when calling UnregisterShmObject on the UuT. unit_under_test_->UnregisterShmObject(BindingType::kLoLa, dummy_service_element_instance_identifier_view_); diff --git a/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp b/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp index a3a5a769c..8e5a5d154 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp @@ -33,6 +33,8 @@ #include "score/mw/log/logging.h" #include "score/mw/log/recorder_mock.h" +#include + #include #include @@ -52,7 +54,7 @@ constexpr std::string_view kInstanceSpecifier{"/my_service_type_port"}; const void* const kLocalDataPtr{reinterpret_cast(static_cast(500))}; constexpr std::size_t kLocalDataSize{8}; -const score::cpp::optional kEmptyDataId{}; +const std::optional kEmptyDataId{}; const analysis::tracing::ServiceInstanceElement::EventIdType kServiceInstanceElementEventId = 42U; const analysis::tracing::ServiceInstanceElement::VariantType kServiceInstanceElementVariant{ @@ -338,12 +340,12 @@ TEST_P(TracingRuntimeTraceShmParamaterisedFixture, TraceShmDataOK_RetryShmObject .WillOnce(Return(trace_context_id_)); // expect, that the binding specific tracing runtime doesn't have a ShmObjectHandle for the given identifier EXPECT_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional{})); + .WillOnce(Return(std::optional{})); // then expect, that UuT calls GetCachedFileDescriptorForReregisteringShmObject() on binding specific tracing // runtime EXPECT_CALL(binding_tracing_runtime_mock_, GetCachedFileDescriptorForReregisteringShmObject(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional>{ + .WillOnce(Return(std::optional>{ {shm_file_descriptor, dummy_shm_object_start_address_}})); // and expect, that it then retries the RegisterShmObject() call on the GenericTraceAPI, which is successful and // returns a ShmObjectHandle @@ -401,12 +403,12 @@ TEST_P(TracingRuntimeTraceShmParamaterisedFixture, TraceShmDataNOK_RetryShmObjec // expect, that the binding specific tracing runtime doesn't have a ShmObjectHandle for the given identifier EXPECT_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional{})); + .WillOnce(Return(std::optional{})); // then expect, that UuT calls GetCachedFileDescriptorForReregisteringShmObject() on binding specific tracing // runtime EXPECT_CALL(binding_tracing_runtime_mock_, GetCachedFileDescriptorForReregisteringShmObject(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional>{ + .WillOnce(Return(std::optional>{ {shm_file_descriptor, dummy_shm_object_start_address_}})); // expect, that UuT calls GetTraceClientId() on the binding specific tracing runtime EXPECT_CALL(binding_tracing_runtime_mock_, GetTraceClientId()).WillOnce(Return(trace_client_id_)); @@ -450,12 +452,12 @@ TEST_P(TracingRuntimeTraceShmParamaterisedFixture, TraceShmDataNOK_RetryShmObjec // expect, that the binding specific tracing runtime doesn't have a ShmObjectHandle for the given identifier EXPECT_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional{})); + .WillOnce(Return(std::optional{})); // then expect, that UuT calls GetCachedFileDescriptorForReregisteringShmObject() on binding specific tracing // runtime EXPECT_CALL(binding_tracing_runtime_mock_, GetCachedFileDescriptorForReregisteringShmObject(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional>{ + .WillOnce(Return(std::optional>{ {shm_file_descriptor, dummy_shm_object_start_address_}})); // expect, that UuT calls GetTraceClientId() on the binding specific tracing runtime EXPECT_CALL(binding_tracing_runtime_mock_, GetTraceClientId()).WillOnce(Return(trace_client_id_)); @@ -494,13 +496,13 @@ TEST_P(TracingRuntimeTraceShmParamaterisedFixture, TraceShmDataNOK_NoCachedFiled // expect, that the binding specific tracing runtime doesn't have a ShmObjectHandle for the given identifier EXPECT_CALL(binding_tracing_runtime_mock_, GetShmObjectHandle(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional{})); + .WillOnce(Return(std::optional{})); // then expect, that UuT calls GetCachedFileDescriptorForReregisteringShmObject() on binding specific tracing // runtime, which doesn't return any EXPECT_CALL(binding_tracing_runtime_mock_, GetCachedFileDescriptorForReregisteringShmObject(dummy_service_element_instance_identifier_view_)) .WillOnce( - Return(score::cpp::optional>{})); + Return(std::optional>{})); // when we call Trace on the UuT auto result = unit_under_test_->Trace(BindingType::kLoLa, @@ -543,7 +545,7 @@ TEST_P(TracingRuntimeTraceShmParamaterisedDeathTest, TraceShmDataNOK_GetShmRegio // address EXPECT_CALL(binding_tracing_runtime_mock_, GetShmRegionStartAddress(dummy_service_element_instance_identifier_view_)) - .WillOnce(Return(score::cpp::optional{})); + .WillOnce(Return(std::optional{})); // when we call Trace on the UuT std::ignore = unit_under_test_->Trace(BindingType::kLoLa, service_element_tracing_data_, @@ -958,7 +960,7 @@ TEST_P(TracingRuntimeTraceLocalParamaterisedFixture, DisabledTracing_EarlyReturn auto result1 = unit_under_test_->Trace(BindingType::kLoLa, dummy_service_element_instance_identifier_view_, trace_point_type_, - score::cpp::optional{}, + std::optional{}, reinterpret_cast(static_cast(500)), std::size_t{0}); EXPECT_FALSE(result1.has_value()); diff --git a/score/mw/com/test/check_values_created_from_config/check_values_created_from_config_application.cpp b/score/mw/com/test/check_values_created_from_config/check_values_created_from_config_application.cpp index 318e56206..926fb8e54 100644 --- a/score/mw/com/test/check_values_created_from_config/check_values_created_from_config_application.cpp +++ b/score/mw/com/test/check_values_created_from_config/check_values_created_from_config_application.cpp @@ -94,7 +94,7 @@ class ConfigParser score::mw::com::impl::ServiceElementType::EVENT}; } - score::cpp::optional GetShmPath() const noexcept + std::optional GetShmPath() const noexcept { const auto shm_name = GetShmName(); if (!(shm_name.has_value())) @@ -105,7 +105,7 @@ class ConfigParser return shm_path; } - score::cpp::optional GetShmName() const noexcept + std::optional GetShmName() const noexcept { const auto lola_service_type_deployment = std::get_if(&type_deployment_.binding_info_); diff --git a/score/mw/com/test/common_test_resources/child_process_guard.cpp b/score/mw/com/test/common_test_resources/child_process_guard.cpp index cadbcda03..20ac8cb1d 100644 --- a/score/mw/com/test/common_test_resources/child_process_guard.cpp +++ b/score/mw/com/test/common_test_resources/child_process_guard.cpp @@ -86,7 +86,7 @@ bool ChildProcessGuard::KillChildProcess() noexcept return true; } -score::cpp::optional ChildProcessGuard::IsProcessDead(bool should_block) noexcept +std::optional ChildProcessGuard::IsProcessDead(bool should_block) noexcept { // Check if KillChildProcess was previously called and process is already dead if (!(pid_.has_value())) diff --git a/score/mw/com/test/common_test_resources/child_process_guard.h b/score/mw/com/test/common_test_resources/child_process_guard.h index fe2a7fabb..bbafe1508 100644 --- a/score/mw/com/test/common_test_resources/child_process_guard.h +++ b/score/mw/com/test/common_test_resources/child_process_guard.h @@ -14,7 +14,7 @@ #ifndef SCORE_MW_COM_TEST_COMMON_TEST_RESOURCES_CHILD_PROCESS_GUARD_H #define SCORE_MW_COM_TEST_COMMON_TEST_RESOURCES_CHILD_PROCESS_GUARD_H -#include +#include #include @@ -30,7 +30,7 @@ class ChildProcessGuard /// \brief Kills the child process, if it is not already dead. /// \return true in case the child could be successfully killed or was dead already, false else. bool KillChildProcess() noexcept; - score::cpp::optional IsProcessDead(bool should_block) noexcept; + std::optional IsProcessDead(bool should_block) noexcept; pid_t GetPid() const noexcept { @@ -39,7 +39,7 @@ class ChildProcessGuard private: // pid_ will be filled on construction of the ChildProcessGuard and will be cleared after calling ChildProcessGuard. - score::cpp::optional pid_; + std::optional pid_; }; } // namespace score::mw::com::test diff --git a/score/mw/com/test/common_test_resources/general_resources.cpp b/score/mw/com/test/common_test_resources/general_resources.cpp index 137c406e2..c592769b7 100644 --- a/score/mw/com/test/common_test_resources/general_resources.cpp +++ b/score/mw/com/test/common_test_resources/general_resources.cpp @@ -172,7 +172,7 @@ os::Result> OpenSharedCheckPointCon return checkpoint_control_guard_result; } -score::cpp::optional ForkProcessAndRunInChildProcess(std::string_view parent_message_prefix, +std::optional ForkProcessAndRunInChildProcess(std::string_view parent_message_prefix, std::string_view child_message_prefix, std::function child_callable) noexcept { diff --git a/score/mw/com/test/common_test_resources/general_resources.h b/score/mw/com/test/common_test_resources/general_resources.h index 2c1336a17..adbac017a 100644 --- a/score/mw/com/test/common_test_resources/general_resources.h +++ b/score/mw/com/test/common_test_resources/general_resources.h @@ -21,11 +21,11 @@ #include "score/os/errno.h" #include -#include #include #include #include +#include #include #include @@ -81,7 +81,7 @@ os::Result> OpenSharedCheckPointCon std::string_view message_prefix, std::string_view shared_memory_file_path) noexcept; -score::cpp::optional ForkProcessAndRunInChildProcess(std::string_view parent_message_prefix, +std::optional ForkProcessAndRunInChildProcess(std::string_view parent_message_prefix, std::string_view child_message_prefix, std::function child_callable) noexcept; diff --git a/score/mw/com/test/common_test_resources/generic_trace_api_test_resources.h b/score/mw/com/test/common_test_resources/generic_trace_api_test_resources.h index 24eb06530..bf1752c28 100644 --- a/score/mw/com/test/common_test_resources/generic_trace_api_test_resources.h +++ b/score/mw/com/test/common_test_resources/generic_trace_api_test_resources.h @@ -17,11 +17,11 @@ #include "score/memory/shared/typedshm/typedshm_wrapper/typed_memory.h" #include -#include #include #include #include +#include #include namespace score::mw::com::test @@ -49,7 +49,7 @@ struct GenericTraceApiMockContext { score::analysis::tracing::TraceLibraryMock generic_trace_api_mock{}; score::analysis::tracing::TraceDoneCallBackType stored_trace_done_cb{}; - score::cpp::optional last_trace_context_id{}; + std::optional last_trace_context_id{}; std::shared_ptr typed_memory_mock{}; }; diff --git a/score/mw/com/test/common_test_resources/proxy_observer.h b/score/mw/com/test/common_test_resources/proxy_observer.h index 3b1e4fa46..07bbf946c 100644 --- a/score/mw/com/test/common_test_resources/proxy_observer.h +++ b/score/mw/com/test/common_test_resources/proxy_observer.h @@ -17,7 +17,7 @@ #include "score/mw/com/impl/runtime.h" #include "score/mw/com/types.h" -#include +#include #include #include #include diff --git a/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp b/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp index 30478e016..ee23f819a 100644 --- a/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp +++ b/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp @@ -24,8 +24,8 @@ #include "score/mw/com/impl/proxy_event.h" #include #include -#include +#include #include #include #include @@ -225,7 +225,7 @@ class SampleReceiver } const score::mw::com::InstanceSpecifier& instance_specifier_; - score::cpp::optional last_received_; + std::optional last_received_; std::size_t received_; }; @@ -295,13 +295,13 @@ bool FileExists(const std::string& filePath) return access(filePath.c_str(), F_OK) == 0; } -score::cpp::optional>> GetMapApiLanesStampedProxyEvent( +std::optional>> GetMapApiLanesStampedProxyEvent( BigDataProxy& proxy) { return proxy.map_api_lanes_stamped_; } -score::cpp::optional> GetMapApiLanesStampedProxyEvent( +std::optional> GetMapApiLanesStampedProxyEvent( GenericProxy& generic_proxy) { const std::string event_name{"map_api_lanes_stamped"}; @@ -422,7 +422,7 @@ Result> PrepareMapLaneSample(BigDataSkele template int EventSenderReceiver::RunAsProxy(const score::mw::com::InstanceSpecifier& instance_specifier, - const score::cpp::optional cycle_time, + const std::optional cycle_time, const std::size_t num_cycles, const score::cpp::stop_token& stop_token, bool try_writing_to_data_segment) @@ -1095,13 +1095,13 @@ int EventSenderReceiver::RunAsProxyCheckSubscribeHandler(const score::mw::com::I template int EventSenderReceiver::RunAsProxy>( const score::mw::com::InstanceSpecifier&, - const score::cpp::optional, + const std::optional, const std::size_t, const score::cpp::stop_token&, bool try_writing_to_data_segment); template int EventSenderReceiver::RunAsProxy( const score::mw::com::InstanceSpecifier&, - const score::cpp::optional, + const std::optional, const std::size_t, const score::cpp::stop_token&, bool try_writing_to_data_segment); diff --git a/score/mw/com/test/common_test_resources/sample_sender_receiver.h b/score/mw/com/test/common_test_resources/sample_sender_receiver.h index 44f0e80d4..997ea26ff 100644 --- a/score/mw/com/test/common_test_resources/sample_sender_receiver.h +++ b/score/mw/com/test/common_test_resources/sample_sender_receiver.h @@ -21,12 +21,12 @@ #include "score/os/utils/interprocess/interprocess_notification.h" #include "score/result/result.h" -#include #include #include #include #include +#include #include #include #include @@ -60,7 +60,7 @@ class EventSenderReceiver template > int RunAsProxy(const score::mw::com::InstanceSpecifier& instance_specifier, - const score::cpp::optional cycle_time, + const std::optional cycle_time, const std::size_t num_cycles, const score::cpp::stop_token& stop_token, bool try_writing_to_data_segment = false); diff --git a/score/mw/com/test/common_test_resources/sctf_test_runner.cpp b/score/mw/com/test/common_test_resources/sctf_test_runner.cpp index e45890629..b3a4bf3f5 100644 --- a/score/mw/com/test/common_test_resources/sctf_test_runner.cpp +++ b/score/mw/com/test/common_test_resources/sctf_test_runner.cpp @@ -29,11 +29,11 @@ namespace using Parameters = SctfTestRunner::RunParameters::Parameters; template -score::cpp::optional GetValueIfProvided(const boost::program_options::variables_map& args, +std::optional GetValueIfProvided(const boost::program_options::variables_map& args, std::string arg_string) { return (args.count(arg_string) > 0U) ? static_cast(args[arg_string].as()) - : score::cpp::optional(); + : std::optional(); } std::string ParameterToString(const Parameters parameter) @@ -62,7 +62,7 @@ std::string ParameterToString(const Parameters parameter) } template -void AssertParameterExists(const score::cpp::optional value, const Parameters parameter) +void AssertParameterExists(const std::optional value, const Parameters parameter) { if (!value.has_value()) { @@ -82,14 +82,14 @@ void AssertParameterInAllowList(const Parameters parameter, const std::vector& allowed_parameters, - score::cpp::optional cycle_time, - score::cpp::optional mode, - score::cpp::optional num_cycles, - score::cpp::optional service_instance_manifest, - score::cpp::optional uid, - score::cpp::optional num_retries, - score::cpp::optional retry_backoff_time, - score::cpp::optional should_modify_data_segment) noexcept + std::optional cycle_time, + std::optional mode, + std::optional num_cycles, + std::optional service_instance_manifest, + std::optional uid, + std::optional num_retries, + std::optional retry_backoff_time, + std::optional should_modify_data_segment) noexcept : allowed_parameters_{allowed_parameters}, cycle_time_{std::move(cycle_time)}, mode_{std::move(mode)}, @@ -158,43 +158,43 @@ bool SctfTestRunner::RunParameters::GetShouldModifyDataSegment() const return should_modify_data_segment_.value(); } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalCycleTime() const +std::optional SctfTestRunner::RunParameters::GetOptionalCycleTime() const { AssertParameterInAllowList(Parameters::CYCLE_TIME, allowed_parameters_); return cycle_time_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalMode() const +std::optional SctfTestRunner::RunParameters::GetOptionalMode() const { AssertParameterInAllowList(Parameters::MODE, allowed_parameters_); return mode_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalNumCycles() const +std::optional SctfTestRunner::RunParameters::GetOptionalNumCycles() const { AssertParameterInAllowList(Parameters::NUM_CYCLES, allowed_parameters_); return num_cycles_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalServiceInstanceManifest() const +std::optional SctfTestRunner::RunParameters::GetOptionalServiceInstanceManifest() const { AssertParameterInAllowList(Parameters::SERVICE_INSTANCE_MANIFEST, allowed_parameters_); return service_instance_manifest_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalUid() const +std::optional SctfTestRunner::RunParameters::GetOptionalUid() const { AssertParameterInAllowList(Parameters::UID, allowed_parameters_); return uid_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalNumRetries() const +std::optional SctfTestRunner::RunParameters::GetOptionalNumRetries() const { AssertParameterInAllowList(Parameters::NUM_RETRIES, allowed_parameters_); return num_retries_; } -score::cpp::optional SctfTestRunner::RunParameters::GetOptionalRetryBackoffTime() const +std::optional SctfTestRunner::RunParameters::GetOptionalRetryBackoffTime() const { AssertParameterInAllowList(Parameters::RETRY_BACKOFF_TIME, allowed_parameters_); return retry_backoff_time_; diff --git a/score/mw/com/test/common_test_resources/sctf_test_runner.h b/score/mw/com/test/common_test_resources/sctf_test_runner.h index c7ababdf3..40193c0bd 100644 --- a/score/mw/com/test/common_test_resources/sctf_test_runner.h +++ b/score/mw/com/test/common_test_resources/sctf_test_runner.h @@ -14,12 +14,12 @@ #ifndef SCORE_MW_COM_TEST_COMMON_TEST_RESOURCES_SCTF_TEST_RUNNER_H #define SCORE_MW_COM_TEST_COMMON_TEST_RESOURCES_SCTF_TEST_RUNNER_H -#include #include #include #include #include +#include #include #include @@ -45,14 +45,14 @@ class SctfTestRunner }; RunParameters(const std::vector& allowed_parameters, - score::cpp::optional cycle_time, - score::cpp::optional mode, - score::cpp::optional num_cycles, - score::cpp::optional service_instance_manifest, - score::cpp::optional uid, - score::cpp::optional num_retries, - score::cpp::optional retry_backoff_time, - score::cpp::optional should_modify_data_segment) noexcept; + std::optional cycle_time, + std::optional mode, + std::optional num_cycles, + std::optional service_instance_manifest, + std::optional uid, + std::optional num_retries, + std::optional retry_backoff_time, + std::optional should_modify_data_segment) noexcept; std::chrono::milliseconds GetCycleTime() const; std::string GetMode() const; @@ -63,24 +63,24 @@ class SctfTestRunner std::chrono::milliseconds GetRetryBackoffTime() const; bool GetShouldModifyDataSegment() const; - score::cpp::optional GetOptionalCycleTime() const; - score::cpp::optional GetOptionalMode() const; - score::cpp::optional GetOptionalNumCycles() const; - score::cpp::optional GetOptionalServiceInstanceManifest() const; - score::cpp::optional GetOptionalUid() const; - score::cpp::optional GetOptionalNumRetries() const; - score::cpp::optional GetOptionalRetryBackoffTime() const; + std::optional GetOptionalCycleTime() const; + std::optional GetOptionalMode() const; + std::optional GetOptionalNumCycles() const; + std::optional GetOptionalServiceInstanceManifest() const; + std::optional GetOptionalUid() const; + std::optional GetOptionalNumRetries() const; + std::optional GetOptionalRetryBackoffTime() const; private: const std::vector allowed_parameters_; - const score::cpp::optional cycle_time_; - const score::cpp::optional mode_; - const score::cpp::optional num_cycles_; - const score::cpp::optional service_instance_manifest_; - const score::cpp::optional uid_; - const score::cpp::optional num_retries_; - const score::cpp::optional retry_backoff_time_; - const score::cpp::optional should_modify_data_segment_; + const std::optional cycle_time_; + const std::optional mode_; + const std::optional num_cycles_; + const std::optional service_instance_manifest_; + const std::optional uid_; + const std::optional num_retries_; + const std::optional retry_backoff_time_; + const std::optional should_modify_data_segment_; }; SctfTestRunner(int argc, const char** argv, const std::vector& allowed_parameters); diff --git a/score/mw/com/test/field_initial_value/client.cpp b/score/mw/com/test/field_initial_value/client.cpp index 7ab97e15d..c2af34c72 100644 --- a/score/mw/com/test/field_initial_value/client.cpp +++ b/score/mw/com/test/field_initial_value/client.cpp @@ -15,7 +15,7 @@ #include "score/mw/com/test/field_initial_value/test_datatype.h" #include "score/mw/com/types.h" -#include +#include #include #include @@ -72,7 +72,7 @@ int run_client(const std::size_t num_retries, const std::chrono::milliseconds re return -3; } auto& lola_proxy = lola_proxy_result.value(); - score::cpp::optional received_value; + std::optional received_value; std::ignore = lola_proxy.test_field.Subscribe(kMaxNumSamples); std::size_t retries = num_retries; diff --git a/score/mw/com/test/find_any_semantics/client.cpp b/score/mw/com/test/find_any_semantics/client.cpp index dc50f4599..d2b2704a1 100644 --- a/score/mw/com/test/find_any_semantics/client.cpp +++ b/score/mw/com/test/find_any_semantics/client.cpp @@ -15,7 +15,7 @@ #include "score/mw/com/test/find_any_semantics/test_datatype.h" #include "score/mw/com/types.h" -#include +#include #include #include @@ -80,7 +80,7 @@ int run_client(const std::size_t num_retries, const std::chrono::milliseconds re return -3; } auto& lola_proxy = lola_proxy_result.value(); - score::cpp::optional received_value; + std::optional received_value; const auto subscribe_result = lola_proxy.test_field.Subscribe(kMaxNumSamples); if (!subscribe_result.has_value()) diff --git a/score/mw/com/test/generic_proxy/generic_proxy_application.cpp b/score/mw/com/test/generic_proxy/generic_proxy_application.cpp index 3d0f79b4f..9da68a2b0 100644 --- a/score/mw/com/test/generic_proxy/generic_proxy_application.cpp +++ b/score/mw/com/test/generic_proxy/generic_proxy_application.cpp @@ -19,7 +19,7 @@ #include "score/mw/com/test/common_test_resources/sample_sender_receiver.h" #include "score/mw/com/test/common_test_resources/sctf_test_runner.h" -#include +#include #include #include @@ -56,7 +56,7 @@ int main(int argc, const char** argv) } else if (mode == "recv" || mode == "proxy") { - const score::cpp::optional cycle_time = {}; + const std::optional cycle_time = {}; return event_sender_receiver .RunAsProxy( instance_specifier, cycle_time, num_cycles, std::cref(stop_token)); diff --git a/score/mw/com/test/partial_restart/consumer_restart/consumer_restart_application.cpp b/score/mw/com/test/partial_restart/consumer_restart/consumer_restart_application.cpp index a7f70c786..40c340654 100644 --- a/score/mw/com/test/partial_restart/consumer_restart/consumer_restart_application.cpp +++ b/score/mw/com/test/partial_restart/consumer_restart/consumer_restart_application.cpp @@ -19,7 +19,6 @@ #include "score/mw/com/test/partial_restart/consumer_restart/consumer.h" #include "score/mw/com/test/partial_restart/consumer_restart/provider.h" -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include @@ -48,13 +48,13 @@ const std::chrono::seconds kMaxWaitTimeToReachCheckpoint{30U}; /// ITF variant 6: Consumer kill/crash restart -> kill_consumer{true} struct TestParameters { - score::cpp::optional service_instance_manifest{}; + std::optional service_instance_manifest{}; std::size_t number_test_iterations{}; /// \brief shall the consumer be killed (true) or gracefully shutdown (false) before restart. bool kill_consumer{false}; }; -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; diff --git a/score/mw/com/test/partial_restart/provider_restart/provider.cpp b/score/mw/com/test/partial_restart/provider_restart/provider.cpp index d019c39e4..fdbde7279 100644 --- a/score/mw/com/test/partial_restart/provider_restart/provider.cpp +++ b/score/mw/com/test/partial_restart/provider_restart/provider.cpp @@ -100,7 +100,7 @@ class CyclicEventSender if (trace_api_mock_context_.last_trace_context_id.has_value()) { trace_api_mock_context_.stored_trace_done_cb(trace_api_mock_context_.last_trace_context_id.value()); - trace_api_mock_context_.last_trace_context_id = score::cpp::nullopt; + trace_api_mock_context_.last_trace_context_id = std::nullopt; } } } diff --git a/score/mw/com/test/partial_restart/provider_restart/provider_restart_application.cpp b/score/mw/com/test/partial_restart/provider_restart/provider_restart_application.cpp index 1d49d0e8a..9b316bdad 100644 --- a/score/mw/com/test/partial_restart/provider_restart/provider_restart_application.cpp +++ b/score/mw/com/test/partial_restart/provider_restart/provider_restart_application.cpp @@ -17,7 +17,7 @@ #include "score/mw/com/test/common_test_resources/stop_token_sig_term_handler.h" #include "score/mw/com/test/partial_restart/provider_restart/controller.h" -#include +#include #include #include @@ -41,7 +41,7 @@ namespace /// -> create_proxy{false}, kill_provider{true} struct TestParameters { - score::cpp::optional service_instance_manifest{}; + std::optional service_instance_manifest{}; std::size_t number_test_iterations{}; /// \brief shall a proxy be created on consumer side (which then also tests implicitly proxy-auto-reconnect) bool create_proxy{true}; @@ -49,7 +49,7 @@ struct TestParameters bool kill_provider{false}; }; -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; diff --git a/score/mw/com/test/partial_restart/provider_restart_max_subscribers/provider_restart_max_subscribers_application.cpp b/score/mw/com/test/partial_restart/provider_restart_max_subscribers/provider_restart_max_subscribers_application.cpp index 070f16142..888859cf8 100644 --- a/score/mw/com/test/partial_restart/provider_restart_max_subscribers/provider_restart_max_subscribers_application.cpp +++ b/score/mw/com/test/partial_restart/provider_restart_max_subscribers/provider_restart_max_subscribers_application.cpp @@ -23,7 +23,7 @@ #include "score/mw/com/test/partial_restart/test_datatype.h" #include "score/mw/com/test/common_test_resources/timeout_supervisor.h" -#include +#include #include #include @@ -45,12 +45,12 @@ using CheckPointControl = score::mw::com::test::CheckPointControl; struct TestParameters { - score::cpp::optional service_instance_manifest{}; + std::optional service_instance_manifest{}; std::size_t number_test_iterations{}; bool connected_proxy_during_restart{true}; }; -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; diff --git a/score/mw/com/test/partial_restart/proxy_restart_shall_not_affect_other_proxies/application.cpp b/score/mw/com/test/partial_restart/proxy_restart_shall_not_affect_other_proxies/application.cpp index f9c244317..e8dc94d82 100644 --- a/score/mw/com/test/partial_restart/proxy_restart_shall_not_affect_other_proxies/application.cpp +++ b/score/mw/com/test/partial_restart/proxy_restart_shall_not_affect_other_proxies/application.cpp @@ -294,7 +294,7 @@ bool DoControllerActions(const TestParameters& test_parameters, score::cpp::stop return true; } -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; TestParameters test_parameters{}; diff --git a/score/mw/com/test/service_discovery_during_consumer_crash/service_discovery_during_consumer_crash_application.cpp b/score/mw/com/test/service_discovery_during_consumer_crash/service_discovery_during_consumer_crash_application.cpp index c9dea196a..91813ed95 100644 --- a/score/mw/com/test/service_discovery_during_consumer_crash/service_discovery_during_consumer_crash_application.cpp +++ b/score/mw/com/test/service_discovery_during_consumer_crash/service_discovery_during_consumer_crash_application.cpp @@ -19,7 +19,6 @@ #include "score/mw/com/test/service_discovery_during_consumer_crash/consumer.h" #include "score/mw/com/test/service_discovery_during_consumer_crash/provider.h" -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -45,11 +45,11 @@ const std::chrono::seconds kMaxWaitTimeToReachCheckpoint{30U}; /// \brief Test parameters for the ITF test. struct TestParameters { - score::cpp::optional service_instance_manifest{}; + std::optional service_instance_manifest{}; std::size_t number_test_iterations{}; }; -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; diff --git a/score/mw/com/test/service_discovery_during_provider_crash/service_discovery_during_provider_crash_application.cpp b/score/mw/com/test/service_discovery_during_provider_crash/service_discovery_during_provider_crash_application.cpp index d1bb18562..a8b43ed03 100644 --- a/score/mw/com/test/service_discovery_during_provider_crash/service_discovery_during_provider_crash_application.cpp +++ b/score/mw/com/test/service_discovery_during_provider_crash/service_discovery_during_provider_crash_application.cpp @@ -19,7 +19,6 @@ #include "score/mw/com/test/service_discovery_during_provider_crash/consumer.h" #include "score/mw/com/test/service_discovery_during_provider_crash/provider.h" -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include @@ -44,11 +44,11 @@ const std::chrono::seconds kMaxWaitTimeToReachCheckpoint{30U}; /// \brief Test parameters for the ITF test. struct TestParameters { - score::cpp::optional service_instance_manifest{}; + std::optional service_instance_manifest{}; std::size_t number_test_iterations{}; }; -score::cpp::optional ParseTestParameters(int argc, const char** argv) noexcept +std::optional ParseTestParameters(int argc, const char** argv) noexcept { namespace po = boost::program_options; diff --git a/score/mw/com/test/service_discovery_offer_and_search/client.cpp b/score/mw/com/test/service_discovery_offer_and_search/client.cpp index 4fa06e462..2d5b401df 100644 --- a/score/mw/com/test/service_discovery_offer_and_search/client.cpp +++ b/score/mw/com/test/service_discovery_offer_and_search/client.cpp @@ -19,7 +19,7 @@ #include "score/mw/com/test/service_discovery_offer_and_search/test_datatype.h" #include "score/mw/com/types.h" -#include +#include #include #include #include diff --git a/score/mw/com/test/service_discovery_search_and_offer/client.cpp b/score/mw/com/test/service_discovery_search_and_offer/client.cpp index 30f718a13..bc7f1964b 100644 --- a/score/mw/com/test/service_discovery_search_and_offer/client.cpp +++ b/score/mw/com/test/service_discovery_search_and_offer/client.cpp @@ -20,7 +20,7 @@ #include "score/mw/com/test/service_discovery_search_and_offer/test_datatype.h" #include "score/mw/com/types.h" -#include +#include #include #include diff --git a/score/mw/com/test/shared_memory_storage/shared_memory_storage_application.cpp b/score/mw/com/test/shared_memory_storage/shared_memory_storage_application.cpp index 978fca0be..e95468317 100644 --- a/score/mw/com/test/shared_memory_storage/shared_memory_storage_application.cpp +++ b/score/mw/com/test/shared_memory_storage/shared_memory_storage_application.cpp @@ -49,7 +49,7 @@ const std::string kProxyDoneInterprocessNotifierShmPath{"/proxy_done_interproces const std::string kSkeletonDoneInterprocessNotifierShmPath{"/skeleton_done_interprocess_notifier_creator"}; template -score::cpp::optional GetElementFqId(ServiceElementType& service_element) +std::optional GetElementFqId(ServiceElementType& service_element) { auto* const map_api_lanes_stamped_binding = score::mw::com::test::GetLolaBinding(service_element); @@ -61,7 +61,7 @@ score::cpp::optional GetElementFqId(Ser } template -score::cpp::optional> GetTypeMetaInfoAddresses( +std::optional> GetTypeMetaInfoAddresses( ServiceType& service, const std::array& element_fq_ids) { diff --git a/score/mw/com/test/shared_memory_storage/test_resources.h b/score/mw/com/test/shared_memory_storage/test_resources.h index ca757c610..da6a94a23 100644 --- a/score/mw/com/test/shared_memory_storage/test_resources.h +++ b/score/mw/com/test/shared_memory_storage/test_resources.h @@ -23,7 +23,7 @@ #include "score/mw/com/test/common_test_resources/big_datatype.h" #include "score/os/utils/interprocess/interprocess_notification.h" -#include +#include #include #include @@ -43,7 +43,7 @@ class ProxyTestAttorney public: explicit ProxyTestAttorney(Proxy& proxy) : proxy_{proxy} {} - score::cpp::optional GetEventMetaInfoAddress(const ElementFqId element_fq_id) const noexcept + std::optional GetEventMetaInfoAddress(const ElementFqId element_fq_id) const noexcept { auto* const service_data_storage = static_cast(proxy_.data_->getUsableBaseAddress()); if (service_data_storage == nullptr) @@ -68,7 +68,7 @@ class SkeletonAttorney public: explicit SkeletonAttorney(Skeleton& skeleton) : skeleton_{skeleton} {} - score::cpp::optional GetEventMetaInfoAddress(const ElementFqId element_fq_id) const noexcept + std::optional GetEventMetaInfoAddress(const ElementFqId element_fq_id) const noexcept { auto search = skeleton_.storage_->events_metainfo_.find(element_fq_id); if (search == skeleton_.storage_->events_metainfo_.cend())