From 3dcfca3a731b0bfe7c86f0354fa4ecfa39b83fc2 Mon Sep 17 00:00:00 2001
From: MediaPipe Team <mediapipe-team@google.com>
Date: Tue, 23 May 2023 17:56:25 -0700
Subject: [PATCH] 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
---
 mediapipe/framework/deps/status_builder.cc |  4 ++--
 mediapipe/framework/deps/status_builder.h  |  4 ++--
 mediapipe/framework/type_map.h             | 15 +++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mediapipe/framework/deps/status_builder.cc b/mediapipe/framework/deps/status_builder.cc
index 0202b868..041b8608 100644
--- a/mediapipe/framework/deps/status_builder.cc
+++ b/mediapipe/framework/deps/status_builder.cc
@@ -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_) {
diff --git a/mediapipe/framework/deps/status_builder.h b/mediapipe/framework/deps/status_builder.h
index ae11699d..935ab777 100644
--- a/mediapipe/framework/deps/status_builder.h
+++ b/mediapipe/framework/deps/status_builder.h
@@ -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();
 
diff --git a/mediapipe/framework/type_map.h b/mediapipe/framework/type_map.h
index e26efa03..8fb324e9 100644
--- a/mediapipe/framework/type_map.h
+++ b/mediapipe/framework/type_map.h
@@ -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.