about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-05-08T16·59-0700
committerJohn Olson <jolson@google.com>2018-05-08T18·35-0400
commitf88b4e9cd876905ee694cee1720095330e0bd20f (patch)
tree778f42d30797417381f459a321e12cc7ba8bb95e
parentbd5a2bba8f4238db2e06c99ac808fc8327dec2a0 (diff)
- bd7f5fa7ad5b7f1371315d45e4e4863f2c2ad9f6 Remove unused includes from string_view.cc. by Greg Falcon <gfalcon@google.com>
  - 692ef928a910fc42bf54b1683d589db4ef58686f Fix build on Mac. GitHub issue #120 reports failure_signa... by Derek Mauro <dmauro@google.com>
  - e5c7aded7ad19ef14c8c980b0bd0ab2ae8598bad Remove stray semicolon; by Abseil Team <absl-team@google.com>

GitOrigin-RevId: bd7f5fa7ad5b7f1371315d45e4e4863f2c2ad9f6
Change-Id: I80850e9bb5eb969fb3a9a79abfd8440258857984
-rw-r--r--absl/debugging/failure_signal_handler.cc3
-rw-r--r--absl/strings/string_view.cc2
-rw-r--r--absl/strings/string_view.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc
index 3aaa29f70759..46ef7b8f5a2f 100644
--- a/absl/debugging/failure_signal_handler.cc
+++ b/absl/debugging/failure_signal_handler.cc
@@ -135,6 +135,9 @@ static bool SetupAlternateStackOnce() {
 #ifndef MAP_STACK
 #define MAP_STACK 0
 #endif
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
   sigstk.ss_sp = mmap(nullptr, sigstk.ss_size, PROT_READ | PROT_WRITE,
                       MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
   if (sigstk.ss_sp == MAP_FAILED) {
diff --git a/absl/strings/string_view.cc b/absl/strings/string_view.cc
index 0e1729546a5f..4ceeb6bff580 100644
--- a/absl/strings/string_view.cc
+++ b/absl/strings/string_view.cc
@@ -22,8 +22,6 @@
 #include <ostream>
 
 #include "absl/strings/internal/memutil.h"
-#include "absl/strings/internal/resize_uninitialized.h"
-#include "absl/strings/match.h"
 
 namespace absl {
 
diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h
index 9162bb33d400..a7f9199240a2 100644
--- a/absl/strings/string_view.h
+++ b/absl/strings/string_view.h
@@ -36,7 +36,7 @@
 
 namespace absl {
 using std::string_view;
-};
+}  // namespace absl
 
 #else  // ABSL_HAVE_STD_STRING_VIEW