summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--absl/base/call_once.h4
-rw-r--r--absl/base/log_severity.h8
-rw-r--r--absl/base/policy_checks.h28
-rw-r--r--absl/types/any_test.cc12
4 files changed, 46 insertions, 6 deletions
diff --git a/absl/base/call_once.h b/absl/base/call_once.h
index fa2a5360..532ee2e3 100644
--- a/absl/base/call_once.h
+++ b/absl/base/call_once.h
@@ -152,10 +152,10 @@ void CallOnceImpl(std::atomic<uint32_t>* control,
old_control != kOnceDone) {
ABSL_RAW_LOG(
FATAL,
- "Unexpected value for control word: %x. Either the control word "
+ "Unexpected value for control word: %lx. Either the control word "
"has non-static storage duration (where GoogleOnceDynamic might "
"be appropriate), or there's been a memory corruption.",
- static_cast<unsigned>(old_control));
+ static_cast<unsigned long>(old_control)); // NOLINT
}
}
#endif // NDEBUG
diff --git a/absl/base/log_severity.h b/absl/base/log_severity.h
index e146bcb0..e2931c34 100644
--- a/absl/base/log_severity.h
+++ b/absl/base/log_severity.h
@@ -22,6 +22,9 @@
namespace absl {
+// Four severity levels are defined. Logging APIs should terminate the program
+// when a message is logged at severity `kFatal`; the other levels have no
+// special semantics.
enum class LogSeverity : int {
kInfo = 0,
kWarning = 1,
@@ -36,6 +39,8 @@ constexpr std::array<absl::LogSeverity, 4> LogSeverities() {
absl::LogSeverity::kError, absl::LogSeverity::kFatal}};
}
+// Returns the all-caps std::string representation (e.g. "INFO") of the specified
+// severity level if it is one of the normal levels and "UNKNOWN" otherwise.
constexpr const char* LogSeverityName(absl::LogSeverity s) {
return s == absl::LogSeverity::kInfo
? "INFO"
@@ -46,7 +51,8 @@ constexpr const char* LogSeverityName(absl::LogSeverity s) {
: s == absl::LogSeverity::kFatal ? "FATAL" : "UNKNOWN";
}
-// Note that out-of-range severities normalize to kInfo or kError, never kFatal.
+// Values less than `kInfo` normalize to `kInfo`; values greater than `kFatal`
+// normalize to `kError` (**NOT** `kFatal`).
constexpr absl::LogSeverity NormalizeLogSeverity(absl::LogSeverity s) {
return s < absl::LogSeverity::kInfo
? absl::LogSeverity::kInfo
diff --git a/absl/base/policy_checks.h b/absl/base/policy_checks.h
index 51b662f4..d634dac6 100644
--- a/absl/base/policy_checks.h
+++ b/absl/base/policy_checks.h
@@ -47,14 +47,14 @@
// We support MSVC++ 14.0 update 2 and later.
// This minimum will go up.
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
-#error "This package requires Visual Studio 2015 Update 2 or higher"
+#error "This package requires Visual Studio 2015 Update 2 or higher."
#endif
// We support gcc 4.7 and later.
// This minimum will go up.
#if defined(__GNUC__) && !defined(__clang__)
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
-#error "This package requires gcc 4.7 or higher"
+#error "This package requires gcc 4.7 or higher."
#endif
#endif
@@ -62,7 +62,7 @@
// This corresponds to Apple Xcode version 4.5.
// This minimum will go up.
#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
-#error "This package requires __apple_build_version__ of 4211165 or higher"
+#error "This package requires __apple_build_version__ of 4211165 or higher."
#endif
// -----------------------------------------------------------------------------
@@ -96,4 +96,26 @@
#error "STLPort is not supported."
#endif
+// -----------------------------------------------------------------------------
+// `char` Size Check
+// -----------------------------------------------------------------------------
+
+// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
+// platform where this is not the case, please provide us with the details about
+// your platform so we can consider relaxing this requirement.
+#if CHAR_BIT != 8
+#error "Abseil assumes CHAR_BIT == 8."
+#endif
+
+// -----------------------------------------------------------------------------
+// `int` Size Check
+// -----------------------------------------------------------------------------
+
+// Abseil currently assumes that an int is 4 bytes. If you would like to use
+// Abseil on a platform where this is not the case, please provide us with the
+// details about your platform so we can consider relaxing this requirement.
+#if INT_MAX < 2147483647
+#error "Abseil assumes that int is at least 4 bytes. "
+#endif
+
#endif // ABSL_BASE_POLICY_CHECKS_H_
diff --git a/absl/types/any_test.cc b/absl/types/any_test.cc
index aef98f30..23aa3a58 100644
--- a/absl/types/any_test.cc
+++ b/absl/types/any_test.cc
@@ -587,10 +587,22 @@ TEST(AnyTest, ConversionConstructionCausesOneCopy) {
// Tests for Exception Behavior //
//////////////////////////////////
+#if defined(ABSL_HAVE_STD_ANY)
+
+// If using a std `any` implementation, we can't check for a specific message.
+#define ABSL_ANY_TEST_EXPECT_BAD_ANY_CAST(...) \
+ ABSL_BASE_INTERNAL_EXPECT_FAIL((__VA_ARGS__), absl::bad_any_cast, \
+ "")
+
+#else
+
+// If using the absl `any` implementation, we can rely on a specific message.
#define ABSL_ANY_TEST_EXPECT_BAD_ANY_CAST(...) \
ABSL_BASE_INTERNAL_EXPECT_FAIL((__VA_ARGS__), absl::bad_any_cast, \
"Bad any cast")
+#endif // defined(ABSL_HAVE_STD_ANY)
+
TEST(AnyTest, ThrowBadAlloc) {
{
absl::any a;