File tree 9 files changed +19
-18
lines changed
9 files changed +19
-18
lines changed Original file line number Diff line number Diff line change 29
29
30
30
#include < boost/optional.hpp> // for optional<>
31
31
32
- #include < fable/json/with_boost .hpp> // for to_json, from_json
33
- #include < fable/schema/interface .hpp> // for Base<>, Box
32
+ #include < fable/schema/interface .hpp> // for Base<>, Box
33
+ #include < fable/utility/boost_optional .hpp> // for to_json, from_json
34
34
35
35
namespace fable {
36
36
namespace schema {
Original file line number Diff line number Diff line change 28
28
29
29
#include < boost/optional.hpp> // for optional<>
30
30
31
- #include < fable/json/with_boost .hpp> // for to_json, from_json
32
- #include < fable/schema/ignore .hpp> // for Ignore
33
- #include < fable/schema/interface .hpp> // for Base<>, Box
31
+ #include < fable/schema/ignore .hpp> // for Ignore
32
+ #include < fable/schema/interface .hpp> // for Base<>, Box
33
+ #include < fable/utility/boost_optional .hpp> // for to_json, from_json
34
34
35
35
namespace fable {
36
36
namespace schema {
Original file line number Diff line number Diff line change 16
16
* SPDX-License-Identifier: Apache-2.0
17
17
*/
18
18
/* *
19
- * \file fable/json/with_boost.hpp
20
- * \see fable/json.hpp
19
+ * \file fable/utility/boost_optional.hpp
21
20
*
22
21
* This file contains specializations of `nlohmann::adl_serializer` for boost
23
22
* types in order to provide serialization for third-party types.
24
23
*/
25
24
26
25
#pragma once
27
26
28
- #include < nlohmann/json.hpp>
29
-
30
- #include < boost/optional.hpp>
27
+ #include < boost/optional.hpp> // for optional<>
28
+ #include < nlohmann/json.hpp> // for adl_serializer<>, json
31
29
32
30
/*
33
31
* In order to provide serialization for third-party types, we need to either
Original file line number Diff line number Diff line change 24
24
#include < boost/optional.hpp> // for optional
25
25
#include < cloe/component.hpp> // for Component
26
26
#include < fable/json.hpp> // for Json
27
+ #include < fable/utility/boost_optional.hpp>
27
28
28
29
namespace cloe {
29
30
Original file line number Diff line number Diff line change 22
22
#pragma once
23
23
24
24
#include < cloe/component.hpp> // for Component, Json
25
+ #include < fable/utility/boost_optional.hpp>
25
26
26
27
namespace cloe {
27
28
Original file line number Diff line number Diff line change 24
24
25
25
#pragma once
26
26
27
- #include < boost/optional.hpp> // for optional<>
28
- #include < fable/json/with_boost .hpp> // for to_json
27
+ #include < boost/optional.hpp> // for optional<>
28
+ #include < fable/utility/boost_optional .hpp> // for to_json
29
29
30
30
#include < cloe/component.hpp> // for Component, Json
31
31
#include < cloe/component/actuator.hpp> // for Actuator
Original file line number Diff line number Diff line change 23
23
24
24
#include < functional> // for function
25
25
26
- #include < boost/optional.hpp> // for optional<>
26
+ #include < boost/optional.hpp> // for optional<>
27
+ #include < fable/utility/boost_optional.hpp> // for to_json
27
28
28
- #include < fable/json/with_boost.hpp> // for to_json
29
29
#include < cloe/component.hpp> // for Component, Json
30
30
#include < cloe/component/object.hpp> // for Object
31
31
Original file line number Diff line number Diff line change 24
24
25
25
#include < string>
26
26
27
- #include < fable/json/with_boost .hpp>
27
+ #include < fable/utility/boost_optional .hpp>
28
28
29
29
#include < cloe/core.hpp>
30
30
Original file line number Diff line number Diff line change 33
33
#include < boost/optional.hpp> // for optional<>
34
34
#include < boost/property_tree/ptree.hpp> // for ptree
35
35
#include < boost/property_tree/xml_parser.hpp> // for read_xml
36
- #include < fable/json/with_boost .hpp> // for to_json
36
+ #include < fable/utility/boost_optional .hpp> // for to_json
37
37
38
38
#include < cloe/core/abort.hpp> // for AbortFlag, abort_checkpoint
39
39
#include < cloe/plugin.hpp> // for EXPORT_CLOE_PLUGIN
45
45
#include < cloe/vehicle.hpp> // for Vehicle
46
46
47
47
#include " rdb_transceiver_tcp.hpp" // for RdbTransceiverTcpFactory
48
+ #include " scp_action.hpp" // for ScpActionFactory
48
49
#include " scp_messages.hpp" // for scp::*
49
50
#include " scp_transceiver.hpp" // for ScpTransceiver
50
- #include " scp_action.hpp" // for ScpActionFactory
51
51
#include " task_control.hpp" // for TaskControl
52
52
#include " vtd_conf.hpp" // for VtdConfiguration
53
53
#include " vtd_vehicle.hpp" // for VtdVehicle
@@ -668,7 +668,8 @@ class VtdBinding : public cloe::Simulator {
668
668
continue ;
669
669
}
670
670
auto & obj = it.second ;
671
- boost::optional<boost::property_tree::ptree&> properties_avail = obj.get_child (" Vehicle" ).get_child_optional (" Properties" );
671
+ boost::optional<boost::property_tree::ptree&> properties_avail =
672
+ obj.get_child (" Vehicle" ).get_child_optional (" Properties" );
672
673
if (!properties_avail) {
673
674
continue ;
674
675
}
You can’t perform that action at this time.
0 commit comments