commit d0f91c863ae0fbb75b41460c8bbb786ade197a0f
author Hao Nguyen <45579440+haon4@users.noreply.github.com> Wed Mar 06 12:39:12 2019 -0800
committer GitHub <noreply@github.com> Wed Mar 06 12:39:12 2019 -0800
tree ff116170eeaa5b35827d90767190c73368d6cce9
parent f5e8ee41dd12e1610d7d377b52778e761e37368c

Down integrate to Github (#5839)

* Down integrate to github

src/google/protobuf/has_bits.h

diff --git a/src/google/protobuf/has_bits.h b/src/google/protobuf/has_bits.h
index d15b3f8..ff0e176 100644
--- a/src/google/protobuf/has_bits.h
+++ b/src/google/protobuf/has_bits.h
@@ -53,11 +53,11 @@
     memset(has_bits_, 0, sizeof(has_bits_));
   }
 
-  ::google::protobuf::uint32& operator[](int index) PROTOBUF_ALWAYS_INLINE {
+  uint32& operator[](int index) PROTOBUF_ALWAYS_INLINE {
     return has_bits_[index];
   }
 
-  const ::google::protobuf::uint32& operator[](int index) const PROTOBUF_ALWAYS_INLINE {
+  const uint32& operator[](int index) const PROTOBUF_ALWAYS_INLINE {
     return has_bits_[index];
   }
 
@@ -72,7 +72,7 @@
   bool empty() const;
 
  private:
-  ::google::protobuf::uint32 has_bits_[doublewords];
+  uint32 has_bits_[doublewords];
 };
 
 template <>