Make crypto::tink::util::StatusOr::AbortWithMessageFrom const, in order to allow usages of the const versions of value(). Part of the Tink migration towards absl::Status{,Or}.

PiperOrigin-RevId: 435610472

2 files changed, 11 insertions, 1 deletions

diff --git a/cc/util/statusor.h b/cc/util/statusor.h
index 1ed2716c7..b7d9b93c3 100644
--- a/cc/util/statusor.h
+++ b/cc/util/statusor.h
@@ -169,7 +169,7 @@ class StatusOr {
     }
   }
 
-  void AbortWithMessageFrom(crypto::tink::util::Status status) {
+  void AbortWithMessageFrom(crypto::tink::util::Status status) const {
     std::cerr << "Attempting to fetch value instead of handling error\n";
     std::cerr << status.ToString();
     std::abort();
diff --git a/cc/util/statusor_test.cc b/cc/util/statusor_test.cc
index 5c1ee68c4..993901f7f 100644
--- a/cc/util/statusor_test.cc
+++ b/cc/util/statusor_test.cc
@@ -132,6 +132,16 @@ TEST(StatusOrTest, MoveOutMoveOnlyValue) {
   ASSERT_THAT(*ten, Eq(10));
 }
 
+TEST(STatusOrTest, CallValueOnConst) {
+  const StatusOr<int> const_status_or_ten = 10;
+  ASSERT_THAT(const_status_or_ten.value(), Eq(10));
+}
+
+TEST(StatusOrTest, CallValueOnConstTemp) {
+  const StatusOr<int> const_status_or_ten = 10;
+  ASSERT_THAT(std::move(const_status_or_ten).value(), Eq(10));
+}
+
 TEST(StatusOrTest, TestValueConst) {
   const int kI = 4;
   const absl::StatusOr<int> thing(kI);