about summary refs log tree commit diff
path: root/absl
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-01-22T21·10-0800
committerJohn Olson <jolson@google.com>2018-01-22T21·22-0500
commit787891a3882795cee0364e8a0f0dda315578d155 (patch)
treec8506515e67ef1bfb15ac6d7af1c018577f77ac7 /absl
parent52a2458965fc2ef6f03fb692b253a1ca56ff6e39 (diff)
Changes imported from Abseil "staging" branch:
  - 5140470240e110cdad301446124b2e6075c4034a Fix typos in the Abseil issue template. by Shaindel Schwartz <shaindel@google.com>
  - 97a197521aa13fed099483c5424be1d4d8a87add Removing deprecated internal interfaces from FixedArray. by Daniel Katz <katzdm@google.com>
  - 2a222b425752e696db5c1688f1dfdb17e228cae9 Rollback for test breakage. by Andrew Hunter <ahh@google.com>
  - d2d27e3ff67021b85726c1fc4d1d18b15e648ecf use std::allocator, not ::operator new in FixedArray for ... by Andrew Hunter <ahh@google.com>
  - 8e0c0a9f5e29e00e0dfca707b88741a7546d09d6 No need to test defined(__has_warning) if not using it by Abseil Team <absl-team@google.com>

GitOrigin-RevId: 5140470240e110cdad301446124b2e6075c4034a
Change-Id: I485aa818efa07f960c924edb62715b5cbc41b97b
Diffstat (limited to 'absl')
-rw-r--r--absl/base/macros.h2
-rw-r--r--absl/container/fixed_array.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/absl/base/macros.h b/absl/base/macros.h
index d41408727731..5ae0f05bf8c1 100644
--- a/absl/base/macros.h
+++ b/absl/base/macros.h
@@ -146,7 +146,7 @@ enum LinkerInitialized {
 // Every usage of a deprecated entity will trigger a warning when compiled with
 // clang's `-Wdeprecated-declarations` option. This option is turned off by
 // default, but the warnings will be reported by clang-tidy.
-#if defined(__clang__) && __cplusplus >= 201103L && defined(__has_warning)
+#if defined(__clang__) && __cplusplus >= 201103L
 #define ABSL_DEPRECATED(message) __attribute__((deprecated(message)))
 #endif
 
diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h
index ec6fced16aba..1fec9d2b3784 100644
--- a/absl/container/fixed_array.h
+++ b/absl/container/fixed_array.h
@@ -175,6 +175,7 @@ class FixedArray {
   // fixed array. This pointer can be used to access and modify the contained
   // elements.
   pointer data() { return AsValue(rep_.begin()); }
+
   // FixedArray::operator[]
   //
   // Returns a reference the ith element of the fixed array.