From a29a9c5d491f2a25b108f474802abad95829a027 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 6 Jul 2016 15:37:27 -0700
Subject: Don't support global ::string in stringpiece.h

---
 src/google/protobuf/stubs/stringpiece.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/google/protobuf/stubs/stringpiece.h b/src/google/protobuf/stubs/stringpiece.h
index 91671659..8910688b 100644
--- a/src/google/protobuf/stubs/stringpiece.h
+++ b/src/google/protobuf/stubs/stringpiece.h
@@ -222,14 +222,6 @@ class LIBPROTOBUF_EXPORT StringPiece {
       : ptr_(str.data()), length_(0) {
     length_ = CheckedSsizeTFromSizeT(str.size());
   }
-#if defined(HAS_GLOBAL_STRING)
-  template <class Allocator>
-  StringPiece(  // NOLINT(runtime/explicit)
-      const basic_string<char, std::char_traits<char>, Allocator>& str)
-      : ptr_(str.data()), length_(0) {
-    length_ = CheckedSsizeTFromSizeT(str.size());
-  }
-#endif
 
   StringPiece(const char* offset, stringpiece_ssize_type len)
       : ptr_(offset), length_(len) {
-- 
cgit v1.2.3