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/random | |
| 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/random')
| -rw-r--r-- | absl/random/internal/gaussian_distribution_gentables.cc | 14 | ||||
| -rw-r--r-- | absl/random/internal/platform.h | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/absl/random/internal/gaussian_distribution_gentables.cc b/absl/random/internal/gaussian_distribution_gentables.cc index 8524796..16a23cb 100644 --- a/absl/random/internal/gaussian_distribution_gentables.cc +++ b/absl/random/internal/gaussian_distribution_gentables.cc @@ -110,8 +110,12 @@ void TableGenerator::Print(std::ostream* os) { "\n" "#include \"absl/random/gaussian_distribution.h\"\n" "\n" - "namespace absl {\n" - "namespace random_internal {\n" + // "namespace " and "absl" are broken apart so as not to conflict with + // script that adds the LTS inline namespace. + "namespace " + "absl {\n" + "namespace " + "random_internal {\n" "\n" "const gaussian_distribution_base::Tables\n" " gaussian_distribution_base::zg_ = {\n"; @@ -120,8 +124,10 @@ void TableGenerator::Print(std::ostream* os) { FormatArrayContents(os, tables_.f); *os << "};\n" "\n" - "} // namespace random_internal\n" - "} // namespace absl\n" + "} // namespace " + "random_internal\n" + "} // namespace " + "absl\n" "\n" "// clang-format on\n" "// END GENERATED CODE"; diff --git a/absl/random/internal/platform.h b/absl/random/internal/platform.h index d1ef5c2..a5a42cb 100644 --- a/absl/random/internal/platform.h +++ b/absl/random/internal/platform.h @@ -30,7 +30,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__ |