diff options
| author |  Abseil Team <absl-team@google.com> | 2019-08-08 10:56:58 -0700 |
|---|---|---|
| committer |  CJ Johnson <johnsoncj@google.com> | 2019-08-08 14:07:16 -0400 |
| commit | 9ee91d3e430fb33a4590486573792eb0fa146c2d (patch) | |
| tree | e71e204df2efe0845c853013e4e3748e721fa91b /absl/base | |
| parent | 8efba58a3b656e9b41fb0471ae6453425a61c520 (diff) | |
Export of internal Abseil changes
--
f51743aa96e19aa3dda96d09d313b4390f1d61e7 by CJ Johnson <johnsoncj@google.com>:
Minor touchup on the InlinedVector/Storage internal header file
PiperOrigin-RevId: 262389640
--
e2f54c1f7142e40d30ff0fda43bef050625821a5 by Abseil Team <absl-team@google.com>:
Update the absl codebase to use proper marketing names for macOS and Xcode
PiperOrigin-RevId: 262389450
--
f29aae774edd0d00e2daa1fb96694a6dc3565a55 by CJ Johnson <johnsoncj@google.com>:
Blocks code generator script from being affected by LTS inline namespaces
PiperOrigin-RevId: 262376791
GitOrigin-RevId: f51743aa96e19aa3dda96d09d313b4390f1d61e7
Change-Id: I33be7f5a708ce8a2b7111b00151e43d73c5e0009
Diffstat (limited to 'absl/base')
| -rw-r--r-- | absl/base/config.h | 4 | ||||
| -rw-r--r-- | absl/base/internal/endian.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index 181d840e..1c3cb08e 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -260,7 +260,7 @@ // Linux and Linux-derived __linux__ // Android __ANDROID__ (implies __linux__) // Linux (non-Android) __linux__ && !__ANDROID__ -// Darwin (Mac OS X and iOS) __APPLE__ +// Darwin (macOS and iOS) __APPLE__ // Akaros (http://akaros.org) __ros__ // Windows _WIN32 // NaCL __native_client__ @@ -370,7 +370,7 @@ #error "absl endian detection needs to be set up for your compiler" #endif -// MacOS 10.13 and iOS 10.11 don't let you use <any>, <optional>, or <variant> +// macOS 10.13 and iOS 10.11 don't let you use <any>, <optional>, or <variant> // even though the headers exist and are publicly noted to work. See // https://github.com/abseil/abseil-cpp/issues/207 and // https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes diff --git a/absl/base/internal/endian.h b/absl/base/internal/endian.h index 6b828b6e..296e92d9 100644 --- a/absl/base/internal/endian.h +++ b/absl/base/internal/endian.h @@ -20,7 +20,7 @@ #ifdef _MSC_VER #include <stdlib.h> // NOLINT(build/include) #elif defined(__APPLE__) -// Mac OS X / Darwin features +// macOS / Darwin features #include <libkern/OSByteOrder.h> #elif defined(__FreeBSD__) #include <sys/endian.h> |