Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I4b2df4343a0f773b82e472b1138536440279e940
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8056
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10799
Tested-by: jenkins <jenkins@lttng.org>
- bpstd::string_view name() const noexcept
+ nonstd::optional<bpstd::string_view> name() const noexcept
- return bt_field_class_variant_option_get_name(this->libObjPtr());
+ const auto name = bt_field_class_variant_option_get_name(this->libObjPtr());
+
+ if (name) {
+ return name;
+ }
+
+ return nonstd::nullopt;
}
ConstFieldClass fieldClass() const noexcept
}
ConstFieldClass fieldClass() const noexcept
return ConstVariantFieldClassOption {_Spec::asBaseOption(this->libObjPtr())};
}
return ConstVariantFieldClassOption {_Spec::asBaseOption(this->libObjPtr())};
}
- bpstd::string_view name() const noexcept
+ nonstd::optional<bpstd::string_view> name() const noexcept
{
return this->asBaseOption().name();
}
{
return this->asBaseOption().name();
}
- void appendOption(const std::string& name, const FieldClass& fc)
+ void appendOption(const nonstd::optional<std::string>& name, const FieldClass& fc)
- this->appendOption(name.data(), fc);
+ this->appendOption(name ? name->data() : nullptr, fc);
}
Shared shared() const noexcept
}
Shared shared() const noexcept
- void appendOption(const std::string& name, const FieldClass& fc)
+ void appendOption(const nonstd::optional<std::string>& name, const FieldClass& fc,
+ const typename Option::RangeSet& ranges)
- this->appendOption(name.data(), fc);
+ this->appendOption(name ? name->data() : nullptr, fc, ranges);
}
Iterator begin() const noexcept
}
Iterator begin() const noexcept