diff options
| author |  Abseil Team <absl-team@google.com> | 2021-04-05 09:52:04 -0700 |
|---|---|---|
| committer |  vslashg <gfalcon@google.com> | 2021-04-05 13:33:42 -0400 |
| commit | 7f4d0ba0be4c70fd71eb4c08a6422c8c2f7faa0b (patch) | |
| tree | a9a63e98d486cfc97e0160289660838bf13dd1d3 | |
| parent | 354030bec37f8d90092245e07323628da50c6996 (diff) | |
Export of internal Abseil changes
--
51798d2ac9c95ee8955955c5d8d78b4c9592ecf7 by Derek Mauro <dmauro@google.com>:
Correctly install pkgconfig files under CMAKE_INSTALL_LIBDIR
Fixes #931
PiperOrigin-RevId: 366816645
--
fbaad678b54dae70e4cd9f4442b4fef9efb71b30 by Abseil Team <absl-team@google.com>:
Add a kDefaultStatusToStringMode representing the default StatusToStringMode.
PiperOrigin-RevId: 366478305
--
25b4be6a591e8b25338a00be1273cd6cae6b0165 by Evan Brown <ezb@google.com>:
Fix a typo in a comment.
PiperOrigin-RevId: 366464483
--
6add48ed8f633c219f02c6ef8af876f8dbaa9955 by Abseil Team <absl-team@google.com>:
Update comment to mention absl::container_literal::Layout which is what is used instead of gtl::Layout.
PiperOrigin-RevId: 366452345
GitOrigin-RevId: 51798d2ac9c95ee8955955c5d8d78b4c9592ecf7
Change-Id: I8e68bc55d81445b2f6f707943fed9075cd402844
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 2 | ||||
| -rw-r--r-- | absl/container/internal/btree.h | 4 | ||||
| -rw-r--r-- | absl/status/status.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 4f6394a..1f75439 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -181,7 +181,7 @@ Requires:${PC_DEPS}\n\ Libs: -L\${libdir} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-labsl_${_NAME}>\n\ Cflags: -I\${includedir}${PC_CFLAGS}\n") INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") endif() endif() diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h index 0bb3836..d372a1d 100644 --- a/absl/container/internal/btree.h +++ b/absl/container/internal/btree.h @@ -484,8 +484,8 @@ class btree_node { std::is_same<std::greater<key_type>, key_compare>::value)>; - // This class is organized by gtl::Layout as if it had the following - // structure: + // This class is organized by absl::container_internal::Layout as if it had + // the following structure: // // A pointer to the node's parent. // btree_node *parent; // diff --git a/absl/status/status.h b/absl/status/status.h index 61486fe..2e05f46 100644 --- a/absl/status/status.h +++ b/absl/status/status.h @@ -293,6 +293,8 @@ enum class StatusToStringMode : int { kWithPayload = 1 << 0, // ToString will include all the extra data this Status has. kWithEverything = ~kWithNoExtraData, + // Default mode used by ToString. Its exact value might change in the future. + kDefault = kWithPayload, }; // absl::StatusToStringMode is specified as a bitmask type, which means the @@ -509,7 +511,7 @@ class Status final { // result, and the payloads to be printed use the status payload printer // mechanism (which is internal). std::string ToString( - StatusToStringMode mode = StatusToStringMode::kWithPayload) const; + StatusToStringMode mode = StatusToStringMode::kDefault) const; // Status::IgnoreError() // |