Fix deprecated usages
* In status_builder.h to use absl::Status directly * In type_map.h to use kTypeId.hash_code() directly PiperOrigin-RevId: 534622923
This commit is contained in:
parent
e8ee934bf9
commit
3dcfca3a73
|
@ -68,11 +68,11 @@ StatusBuilder&& StatusBuilder::SetNoLogging() && {
|
|||
return std::move(SetNoLogging());
|
||||
}
|
||||
|
||||
StatusBuilder::operator Status() const& {
|
||||
StatusBuilder::operator absl::Status() const& {
|
||||
return StatusBuilder(*this).JoinMessageToStatus();
|
||||
}
|
||||
|
||||
StatusBuilder::operator Status() && { return JoinMessageToStatus(); }
|
||||
StatusBuilder::operator absl::Status() && { return JoinMessageToStatus(); }
|
||||
|
||||
absl::Status StatusBuilder::JoinMessageToStatus() {
|
||||
if (!impl_) {
|
||||
|
|
|
@ -83,8 +83,8 @@ class ABSL_MUST_USE_RESULT StatusBuilder {
|
|||
return std::move(*this << msg);
|
||||
}
|
||||
|
||||
operator Status() const&;
|
||||
operator Status() &&;
|
||||
operator absl::Status() const&;
|
||||
operator absl::Status() &&;
|
||||
|
||||
absl::Status JoinMessageToStatus();
|
||||
|
||||
|
|
|
@ -272,17 +272,20 @@ DEFINE_MEDIAPIPE_TYPE_MAP(PacketTypeStringToMediaPipeTypeData, std::string);
|
|||
#define MEDIAPIPE_REGISTER_TYPE(type, type_name, serialize_fn, deserialize_fn) \
|
||||
SET_MEDIAPIPE_TYPE_MAP_VALUE( \
|
||||
mediapipe::PacketTypeIdToMediaPipeTypeData, \
|
||||
mediapipe::tool::GetTypeHash< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>(), \
|
||||
mediapipe::TypeId::Of< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>() \
|
||||
.hash_code(), \
|
||||
(mediapipe::MediaPipeTypeData{ \
|
||||
mediapipe::tool::GetTypeHash< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>(), \
|
||||
mediapipe::TypeId::Of< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>() \
|
||||
.hash_code(), \
|
||||
type_name, serialize_fn, deserialize_fn})); \
|
||||
SET_MEDIAPIPE_TYPE_MAP_VALUE( \
|
||||
mediapipe::PacketTypeStringToMediaPipeTypeData, type_name, \
|
||||
(mediapipe::MediaPipeTypeData{ \
|
||||
mediapipe::tool::GetTypeHash< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>(), \
|
||||
mediapipe::TypeId::Of< \
|
||||
mediapipe::type_map_internal::ReflectType<void(type*)>::Type>() \
|
||||
.hash_code(), \
|
||||
type_name, serialize_fn, deserialize_fn}));
|
||||
// End define MEDIAPIPE_REGISTER_TYPE.
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user