diff options
| author |  Derek Mauro <dmauro@google.com> | 2022-07-12 02:09:56 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-worker@google.com> | 2022-07-12 02:10:39 -0700 |
| commit | 504229dfa44f072b21b79eea6b71c98e0229f09f (patch) | |
| tree | c85ff95f07de5d797c9e0ecff88e2fe7dab1edef /absl/strings/string_view.h | |
| parent | 427d8f5756e908d8573e45b8e8c328394f038c36 (diff) | |
string_view: conditional constexpr is no longer needed for C++14
PiperOrigin-RevId: 460407142
Change-Id: I9501d2e79cf8c20c5261ab0169bd4bbc3b02980c
Diffstat (limited to 'absl/strings/string_view.h')
| -rw-r--r-- | absl/strings/string_view.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h index e3239f57..eae11b2a 100644 --- a/absl/strings/string_view.h +++ b/absl/strings/string_view.h @@ -63,12 +63,6 @@ ABSL_NAMESPACE_END #define ABSL_INTERNAL_STRING_VIEW_MEMCMP memcmp #endif // ABSL_HAVE_BUILTIN(__builtin_memcmp) -#if defined(__cplusplus) && __cplusplus >= 201402L -#define ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR constexpr -#else -#define ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR -#endif - namespace absl { ABSL_NAMESPACE_BEGIN @@ -341,7 +335,7 @@ class string_view { // // Removes the first `n` characters from the `string_view`. Note that the // underlying string is not changed, only the view. - ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR void remove_prefix(size_type n) { + constexpr void remove_prefix(size_type n) { ABSL_HARDENING_ASSERT(n <= length_); ptr_ += n; length_ -= n; @@ -351,7 +345,7 @@ class string_view { // // Removes the last `n` characters from the `string_view`. Note that the // underlying string is not changed, only the view. - ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR void remove_suffix(size_type n) { + constexpr void remove_suffix(size_type n) { ABSL_HARDENING_ASSERT(n <= length_); length_ -= n; } @@ -359,7 +353,7 @@ class string_view { // string_view::swap() // // Swaps this `string_view` with another `string_view`. - ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR void swap(string_view& s) noexcept { + constexpr void swap(string_view& s) noexcept { auto t = *this; *this = s; s = t; @@ -678,7 +672,6 @@ std::ostream& operator<<(std::ostream& o, string_view piece); ABSL_NAMESPACE_END } // namespace absl -#undef ABSL_INTERNAL_STRING_VIEW_CXX14_CONSTEXPR #undef ABSL_INTERNAL_STRING_VIEW_MEMCMP #endif // ABSL_USES_STD_STRING_VIEW |