Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Replace boost::optional with std::optional in trace and js #2707

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Replace boost::optional with std::optional in trace and js #2707

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pxr/base/js/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ JsFindValue(
{
if (key.empty()) {
TF_CODING_ERROR("Key is empty");
return boost::none;
return std::nullopt;
}

JsObject::const_iterator i = object.find(key);
Expand Down
7 changes: 3 additions & 4 deletions pxr/base/js/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
#include "pxr/base/js/api.h"
#include "pxr/base/js/value.h"

#include <boost/none.hpp>
#include <boost/optional.hpp>
#include <optional>
#include <string>

PXR_NAMESPACE_OPEN_SCOPE

typedef boost::optional<JsValue> JsOptionalValue;
typedef std::optional<JsValue> JsOptionalValue;

/// Returns the value associated with \p key in the given \p object. If no
/// such key exists, and the supplied default is not supplied, this method
Expand All @@ -46,7 +45,7 @@ JS_API
JsOptionalValue JsFindValue(
const JsObject& object,
const std::string& key,
const JsOptionalValue& defaultValue = boost::none);
const JsOptionalValue& defaultValue = std::nullopt);

PXR_NAMESPACE_CLOSE_SCOPE

Expand Down
2 changes: 0 additions & 2 deletions pxr/base/trace/eventTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@

#include "pxr/base/js/json.h"

#include <boost/optional.hpp>

PXR_NAMESPACE_OPEN_SCOPE

TraceEventTreeRefPtr
Expand Down
42 changes: 22 additions & 20 deletions pxr/base/trace/jsonSerialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "pxr/base/trace/eventData.h"
#include "pxr/base/trace/eventTreeBuilder.h"

#include <optional>

PXR_NAMESPACE_OPEN_SCOPE

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -43,13 +45,13 @@ static
typename std::enable_if<
!std::is_same<T, JsObject>::value &&
!std::is_same<T, JsArray>::value &&
!std::is_same<T, std::string>::value, boost::optional<T> >::type
_JsGet(const boost::optional<JsValue>& js)
!std::is_same<T, std::string>::value, std::optional<T>>::type
_JsGet(const std::optional<JsValue>& js)
{
if (js && js->Is<T>()) {
return js->Get<T>();
}
return boost::none;
return std::nullopt;
}

template<typename T>
Expand All @@ -58,7 +60,7 @@ typename std::enable_if<
std::is_same<T, JsObject>::value ||
std::is_same<T, JsArray>::value ||
std::is_same<T, std::string>::value, const T* >::type
_JsGet(const boost::optional<JsValue>& js)
_JsGet(const std::optional<JsValue>& js)
{
if (js && js->Is<T>()) {
return &js->Get<T>();
Expand All @@ -72,7 +74,7 @@ template <typename T,
std::is_same<T, JsObject>::value ||
std::is_same<T, JsArray>::value ||
std::is_same<T, std::string>::value,
const T*, boost::optional<T> >::type>
const T*, std::optional<T> >::type>
ReturnType _JsGetValue(const JsObject& js, const std::string& key) {
return _JsGet<T>(JsFindValue(js, key));
}
Expand Down Expand Up @@ -206,11 +208,11 @@ _TraceEventFromJSON(

const JsObject& js = jsValue.GetJsObject();
const std::string* keyStr = _JsGetValue<std::string>(js, "key");
boost::optional<uint64_t> category = _JsGetValue<uint64_t>(js, "category");
std::optional<uint64_t> category = _JsGetValue<uint64_t>(js, "category");
const std::string* typeStr = _JsGetValue<std::string>(js, "type");
boost::optional<double> tsMicroSeconds =
std::optional<double> tsMicroSeconds =
_JsGetValue<double>(js, "ts");
boost::optional<TraceEvent::TimeStamp> ts;
std::optional<TraceEvent::TimeStamp> ts;
if (tsMicroSeconds) {
ts = _MicrosecondsToTicks(*tsMicroSeconds);
}
Expand Down Expand Up @@ -248,9 +250,9 @@ _TraceEventFromJSON(
break;
case TraceEvent::EventType::Timespan:
{
boost::optional<TraceEvent::TimeStamp> start =
std::optional<TraceEvent::TimeStamp> start =
_JsGetValue<TraceEvent::TimeStamp>(js, "start");
boost::optional<TraceEvent::TimeStamp> end =
std::optional<TraceEvent::TimeStamp> end =
_JsGetValue<TraceEvent::TimeStamp>(js, "end");
if (start && end) {
unorderedEvents.emplace_back(
Expand All @@ -264,7 +266,7 @@ _TraceEventFromJSON(
break;
case TraceEvent::EventType::CounterDelta:
{
boost::optional<double> value =
std::optional<double> value =
_JsGetValue<double>(js, "value");
if (ts && value) {
TraceEvent event(TraceEvent::CounterDelta,
Expand All @@ -278,7 +280,7 @@ _TraceEventFromJSON(
break;
case TraceEvent::EventType::CounterValue:
{
boost::optional<double> value =
std::optional<double> value =
_JsGetValue<double>(js, "value");
if (ts && value) {
TraceEvent event(TraceEvent::CounterValue,
Expand All @@ -292,7 +294,7 @@ _TraceEventFromJSON(
break;
case TraceEvent::EventType::ScopeData:
if (ts) {
if (boost::optional<JsValue> dataValue =
if (std::optional<JsValue> dataValue =
JsFindValue(js, "data")) {
if (dataValue->Is<bool>()) {
TraceEvent event(
Expand Down Expand Up @@ -462,7 +464,7 @@ _ImportChromeEvents(
_JsGetValue<std::string>(*eventObj, "tid");
// tid field might be an integer
if (!tid) {
boost::optional<uint64_t> utid =
std::optional<uint64_t> utid =
_JsGetValue<uint64_t>(*eventObj, "tid");
if (utid) {
auto it = tidToNames.find(*utid);
Expand All @@ -476,10 +478,10 @@ _ImportChromeEvents(
}
}

boost::optional<double> ts = _JsGetValue<double>(*eventObj, "ts");
std::optional<double> ts = _JsGetValue<double>(*eventObj, "ts");
// ts field might be an integer
if (!ts) {
boost::optional<uint64_t> uts =
std::optional<uint64_t> uts =
_JsGetValue<uint64_t>(*eventObj, "ts");
if (uts) {
ts = *uts;
Expand All @@ -488,7 +490,7 @@ _ImportChromeEvents(
const std::string* name =
_JsGetValue<std::string>(*eventObj, "name");
const std::string* ph = _JsGetValue<std::string>(*eventObj, "ph");
boost::optional<uint64_t> catId =
std::optional<uint64_t> catId =
_JsGetValue<uint64_t>(*eventObj, "libTraceCatId");

if (tid && ts && name && ph) {
Expand Down Expand Up @@ -518,10 +520,10 @@ _ImportChromeEvents(
*catId);
} else if (*ph == "X") {
// dur field might be a double or an int.
boost::optional<double> dur =
std::optional<double> dur =
_JsGetValue<double>(*eventObj, "dur");
if (!dur) {
boost::optional<uint64_t> udur =
std::optional<uint64_t> udur =
_JsGetValue<uint64_t>(*eventObj, "dur");
if (udur) {
dur = *udur;
Expand All @@ -531,7 +533,7 @@ _ImportChromeEvents(
if (!dur) {
// tdur field might be a double or an int.
dur = _JsGetValue<double>(*eventObj, "tdur");
boost::optional<uint64_t> utdur =
std::optional<uint64_t> utdur =
_JsGetValue<uint64_t>(*eventObj, "tdur");
if (utdur) {
dur = *utdur;
Expand Down