summaryrefslogtreecommitdiff
path: root/absl
diff options
context:
space:
mode:
authorGravatar Andy Getzendanner <durandal@google.com>2022-06-10 15:12:31 -0700
committerGravatar Copybara-Service <copybara-worker@google.com>2022-06-10 15:13:23 -0700
commiteda52d053e6400d9411b1f46a1a17a959d4db11f (patch)
treeaedfbb344277d20dc7122fe53c43e4efb69df8ef /absl
parent9431a837919ba242eb7560a3ec74c55db3a027d2 (diff)
Tweak the signature of status_internal::MakeCheckFailString as part of an upcoming change
PiperOrigin-RevId: 454251164 Change-Id: I256b7a662478f9317a4133ec209fa5488a942886
Diffstat (limited to 'absl')
-rw-r--r--absl/status/internal/status_internal.h8
-rw-r--r--absl/status/status.cc5
2 files changed, 6 insertions, 7 deletions
diff --git a/absl/status/internal/status_internal.h b/absl/status/internal/status_internal.h
index fc1e78bc..19a4a7aa 100644
--- a/absl/status/internal/status_internal.h
+++ b/absl/status/internal/status_internal.h
@@ -15,6 +15,7 @@
#define ABSL_STATUS_INTERNAL_STATUS_INTERNAL_H_
#include <string>
+#include <utility>
#include "absl/base/attributes.h"
#include "absl/container/inlined_vector.h"
@@ -70,12 +71,11 @@ struct StatusRep {
absl::StatusCode MapToLocalCode(int value);
-// If `status` is not OK, returns a pointer to a newly-allocated string with the
-// given `prefix`, suitable for output as an error message in assertion/CHECK()
-// failures. Otherwise returns nullptr.
+// Returns a pointer to a newly-allocated string with the given `prefix`,
+// suitable for output as an error message in assertion/`CHECK()` failures.
//
// This is an internal implementation detail for Abseil logging.
-std::string* MakeCheckFailString(const absl::Status& status,
+std::string* MakeCheckFailString(const absl::Status* status,
const char* prefix);
} // namespace status_internal
diff --git a/absl/status/status.cc b/absl/status/status.cc
index 89749a52..88e8eda9 100644
--- a/absl/status/status.cc
+++ b/absl/status/status.cc
@@ -603,12 +603,11 @@ Status ErrnoToStatus(int error_number, absl::string_view message) {
namespace status_internal {
-std::string* MakeCheckFailString(const absl::Status& status,
+std::string* MakeCheckFailString(const absl::Status* status,
const char* prefix) {
- if (status.ok()) { return nullptr; }
return new std::string(
absl::StrCat(prefix, " (",
- status.ToString(StatusToStringMode::kWithEverything), ")"));
+ status->ToString(StatusToStringMode::kWithEverything), ")"));
}
} // namespace status_internal