From 82c4cec472b151f3577966cbaaf192237d3bf7c7 Mon Sep 17 00:00:00 2001
From: Marcin Kowalczyk <qrczak@google.com>
Date: Tue, 2 Jul 2024 16:50:01 +0200
Subject: [PATCH] Fix `RiegeliToExternalStorage(SharedPtr<const T>*)` and
 `RiegeliToExternalStorage(IntrusiveSharedPtr<const T>*)` build by adding a
 `const_cast`.

PiperOrigin-RevId: 648716816
---
 riegeli/base/intrusive_shared_ptr.h | 2 +-
 riegeli/base/shared_ptr.h           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/riegeli/base/intrusive_shared_ptr.h b/riegeli/base/intrusive_shared_ptr.h
index ab579316..bb90d473 100644
--- a/riegeli/base/intrusive_shared_ptr.h
+++ b/riegeli/base/intrusive_shared_ptr.h
@@ -263,7 +263,7 @@ class
 
   // Support `ExternalRef`.
   friend ExternalStorage RiegeliToExternalStorage(IntrusiveSharedPtr* self) {
-    return ExternalStorage(self->Release(),
+    return ExternalStorage(const_cast<std::remove_cv_t<T>*>(self->Release()),
                            [](void* ptr) { Unref(static_cast<T*>(ptr)); });
   }
 
diff --git a/riegeli/base/shared_ptr.h b/riegeli/base/shared_ptr.h
index 2b6694f9..345b2812 100644
--- a/riegeli/base/shared_ptr.h
+++ b/riegeli/base/shared_ptr.h
@@ -208,9 +208,9 @@ class
 
   // Support `ExternalRef`.
   friend ExternalStorage RiegeliToExternalStorage(SharedPtr* self) {
-    return ExternalStorage(self->Release(), [](void* ptr) {
-      SharedPtr::DeleteReleased(static_cast<T*>(ptr));
-    });
+    return ExternalStorage(
+        const_cast<std::remove_cv_t<T>*>(self->Release()),
+        [](void* ptr) { SharedPtr::DeleteReleased(static_cast<T*>(ptr)); });
   }
 
   // Support `MemoryEstimator`.