Update //third_party/protobuf to version 3.

third_party/protobuf/src/google/protobuf/stubs/int128.h

Index: third_party/protobuf/src/google/protobuf/stubs/int128.h
diff --git a/net/base/int128.h b/third_party/protobuf/src/google/protobuf/stubs/int128.h
similarity index 54%
copy from net/base/int128.h
copy to third_party/protobuf/src/google/protobuf/stubs/int128.h
index 57501fb8c8387087ede3d217763768885c9f0c00..1499bb76d5e0ba7959243ef462059f50f98831db 100644
--- a/net/base/int128.h
+++ b/third_party/protobuf/src/google/protobuf/stubs/int128.h
@@ -1,38 +1,75 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef NET_BASE_INT128_H_
-#define NET_BASE_INT128_H_
-
-#include <stdint.h>
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifndef GOOGLE_PROTOBUF_STUBS_INT128_H_
+#define GOOGLE_PROTOBUF_STUBS_INT128_H_
+
+#include <google/protobuf/stubs/common.h>
 
 #include <iosfwd>
 
-#include "net/base/net_export.h"
+namespace google {
+namespace protobuf {
 
 struct uint128_pod;
 
+// TODO(xiaofeng): Define GOOGLE_PROTOBUF_HAS_CONSTEXPR when constexpr is
+// available.
+#ifdef GOOGLE_PROTOBUF_HAS_CONSTEXPR
+# define UINT128_CONSTEXPR constexpr
+#else
+# define UINT128_CONSTEXPR
+#endif
+
 // An unsigned 128-bit integer type. Thread-compatible.
-class uint128 {
+class LIBPROTOBUF_EXPORT uint128 {
  public:
-  uint128();  // Sets to 0, but don't trust on this behavior.
-  uint128(uint64_t top, uint64_t bottom);
-  uint128(int bottom);
-  uint128(uint32_t bottom);  // Top 96 bits = 0
-  uint128(uint64_t bottom);  // hi_ = 0
-  uint128(const uint128 &val);
-  uint128(const uint128_pod &val);
+  UINT128_CONSTEXPR uint128();  // Sets to 0, but don't trust on this behavior.
+  UINT128_CONSTEXPR uint128(uint64 top, uint64 bottom);
+#ifndef SWIG
+  UINT128_CONSTEXPR uint128(int bottom);
+  UINT128_CONSTEXPR uint128(uint32 bottom);   // Top 96 bits = 0
+#endif
+  UINT128_CONSTEXPR uint128(uint64 bottom);   // hi_ = 0
+  UINT128_CONSTEXPR uint128(const uint128_pod &val);
 
-  void Initialize(uint64_t top, uint64_t bottom);
+  // Trivial copy constructor, assignment operator and destructor.
 
-  uint128& operator=(const uint128& b);
+  void Initialize(uint64 top, uint64 bottom);
 
   // Arithmetic operators.
-  // TODO: division, etc.
   uint128& operator+=(const uint128& b);
   uint128& operator-=(const uint128& b);
   uint128& operator*=(const uint128& b);
+  // Long division/modulo for uint128.
+  uint128& operator/=(const uint128& b);
+  uint128& operator%=(const uint128& b);
   uint128 operator++(int);
   uint128 operator--(int);
   uint128& operator<<=(int);
@@ -43,23 +80,26 @@ class uint128 {
   uint128& operator++();
   uint128& operator--();
 
-  friend uint64_t Uint128Low64(const uint128& v);
-  friend uint64_t Uint128High64(const uint128& v);
+  friend uint64 Uint128Low64(const uint128& v);
+  friend uint64 Uint128High64(const uint128& v);
 
   // We add "std::" to avoid including all of port.h.
-  friend NET_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& o,
+  LIBPROTOBUF_EXPORT friend std::ostream& operator<<(std::ostream& o,
                                                      const uint128& b);
 
  private:
+  static void DivModImpl(uint128 dividend, uint128 divisor,
+                         uint128* quotient_ret, uint128* remainder_ret);
+
   // Little-endian memory order optimizations can benefit from
   // having lo_ first, hi_ last.
   // See util/endian/endian.h and Load128/Store128 for storing a uint128.
-  uint64_t lo_;
-  uint64_t hi_;
+  uint64        lo_;
+  uint64        hi_;
 
   // Not implemented, just declared for catching automatic type conversions.
-  uint128(uint8_t);
-  uint128(uint16_t);
+  uint128(uint8);
+  uint128(uint16);
   uint128(float v);
   uint128(double v);
 };
@@ -72,25 +112,21 @@ struct uint128_pod {
   // of static instances, which is the primary reason for this struct in the
   // first place.  This does not seem to defeat any optimizations wrt
   // operations involving this struct.
-  uint64_t hi;
-  uint64_t lo;
+  uint64 hi;
+  uint64 lo;
 };
 
-NET_EXPORT_PRIVATE extern const uint128_pod kuint128max;
+LIBPROTOBUF_EXPORT extern const uint128_pod kuint128max;
 
 // allow uint128 to be logged
-NET_EXPORT_PRIVATE extern std::ostream& operator<<(std::ostream& o,
+LIBPROTOBUF_EXPORT extern std::ostream& operator<<(std::ostream& o,
                                                    const uint128& b);
 
 // Methods to access low and high pieces of 128-bit value.
 // Defined externally from uint128 to facilitate conversion
 // to native 128-bit types when compilers support them.
-inline uint64_t Uint128Low64(const uint128& v) {
-  return v.lo_;
-}
-inline uint64_t Uint128High64(const uint128& v) {
-  return v.hi_;
-}
+inline uint64 Uint128Low64(const uint128& v) { return v.lo_; }
+inline uint64 Uint128High64(const uint128& v) { return v.hi_; }
 
 // TODO: perhaps it would be nice to have int128, a signed 128-bit type?
 
@@ -104,25 +140,24 @@ inline bool operator==(const uint128& lhs, const uint128& rhs) {
 inline bool operator!=(const uint128& lhs, const uint128& rhs) {
   return !(lhs == rhs);
 }
-inline uint128& uint128::operator=(const uint128& b) {
-  lo_ = b.lo_;
-  hi_ = b.hi_;
-  return *this;
-}
 
-inline uint128::uint128(): lo_(0), hi_(0) { }
-inline uint128::uint128(uint64_t top, uint64_t bottom)
+inline UINT128_CONSTEXPR uint128::uint128() : lo_(0), hi_(0) {}
+inline UINT128_CONSTEXPR uint128::uint128(uint64 top, uint64 bottom)
     : lo_(bottom), hi_(top) {}
-inline uint128::uint128(const uint128 &v) : lo_(v.lo_), hi_(v.hi_) { }
-inline uint128::uint128(const uint128_pod &v) : lo_(v.lo), hi_(v.hi) { }
-inline uint128::uint128(uint64_t bottom) : lo_(bottom), hi_(0) {}
-inline uint128::uint128(uint32_t bottom) : lo_(bottom), hi_(0) {}
-inline uint128::uint128(int bottom) : lo_(bottom), hi_(0) {
-  if (bottom < 0) {
-    --hi_;
-  }
-}
-inline void uint128::Initialize(uint64_t top, uint64_t bottom) {
+inline UINT128_CONSTEXPR uint128::uint128(const uint128_pod& v)
+    : lo_(v.lo), hi_(v.hi) {}
+inline UINT128_CONSTEXPR uint128::uint128(uint64 bottom)
+    : lo_(bottom), hi_(0) {}
+#ifndef SWIG
+inline UINT128_CONSTEXPR uint128::uint128(uint32 bottom)
+    : lo_(bottom), hi_(0) {}
+inline UINT128_CONSTEXPR uint128::uint128(int bottom)
+    : lo_(bottom), hi_(static_cast<int64>((bottom < 0) ? -1 : 0)) {}
+#endif
+
+#undef UINT128_CONSTEXPR
+
+inline void uint128::Initialize(uint64 top, uint64 bottom) {
   hi_ = top;
   lo_ = bottom;
 }
@@ -146,9 +181,9 @@ CMP128(<=)
 // Unary operators
 
 inline uint128 operator-(const uint128& val) {
-  const uint64_t hi_flip = ~Uint128High64(val);
-  const uint64_t lo_flip = ~Uint128Low64(val);
-  const uint64_t lo_add = lo_flip + 1;
+  const uint64 hi_flip = ~Uint128High64(val);
+  const uint64 lo_flip = ~Uint128Low64(val);
+  const uint64 lo_add = lo_flip + 1;
   if (lo_add < lo_flip) {
     return uint128(hi_flip + 1, lo_add);
   }
@@ -193,15 +228,14 @@ LOGICASSIGN128(^=)
 // Shift operators.
 
 inline uint128 operator<<(const uint128& val, int amount) {
-  // uint64_t shifts of >= 64 are undefined, so we will need some
-  // special-casing.
+  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
   if (amount < 64) {
     if (amount == 0) {
       return val;
     }
-    uint64_t new_hi =
-        (Uint128High64(val) << amount) | (Uint128Low64(val) >> (64 - amount));
-    uint64_t new_lo = Uint128Low64(val) << amount;
+    uint64 new_hi = (Uint128High64(val) << amount) |
+                    (Uint128Low64(val) >> (64 - amount));
+    uint64 new_lo = Uint128Low64(val) << amount;
     return uint128(new_hi, new_lo);
   } else if (amount < 128) {
     return uint128(Uint128Low64(val) << (amount - 64), 0);
@@ -211,15 +245,14 @@ inline uint128 operator<<(const uint128& val, int amount) {
 }
 
 inline uint128 operator>>(const uint128& val, int amount) {
-  // uint64_t shifts of >= 64 are undefined, so we will need some
-  // special-casing.
+  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
   if (amount < 64) {
     if (amount == 0) {
       return val;
     }
-    uint64_t new_hi = Uint128High64(val) >> amount;
-    uint64_t new_lo =
-        (Uint128Low64(val) >> amount) | (Uint128High64(val) << (64 - amount));
+    uint64 new_hi = Uint128High64(val) >> amount;
+    uint64 new_lo = (Uint128Low64(val) >> amount) |
+                    (Uint128High64(val) << (64 - amount));
     return uint128(new_hi, new_lo);
   } else if (amount < 128) {
     return uint128(0, Uint128High64(val) >> (amount - 64));
@@ -229,8 +262,7 @@ inline uint128 operator>>(const uint128& val, int amount) {
 }
 
 inline uint128& uint128::operator<<=(int amount) {
-  // uint64_t shifts of >= 64 are undefined, so we will need some
-  // special-casing.
+  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
   if (amount < 64) {
     if (amount != 0) {
       hi_ = (hi_ << amount) | (lo_ >> (64 - amount));
@@ -247,19 +279,18 @@ inline uint128& uint128::operator<<=(int amount) {
 }
 
 inline uint128& uint128::operator>>=(int amount) {
-  // uint64_t shifts of >= 64 are undefined, so we will need some
-  // special-casing.
+  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
   if (amount < 64) {
     if (amount != 0) {
       lo_ = (lo_ >> amount) | (hi_ << (64 - amount));
       hi_ = hi_ >> amount;
     }
   } else if (amount < 128) {
-    hi_ = 0;
     lo_ = hi_ >> (amount - 64);
-  } else {
     hi_ = 0;
+  } else {
     lo_ = 0;
+    hi_ = 0;
   }
   return *this;
 }
@@ -276,9 +307,17 @@ inline uint128 operator*(const uint128& lhs, const uint128& rhs) {
   return uint128(lhs) *= rhs;
 }
 
+inline uint128 operator/(const uint128& lhs, const uint128& rhs) {
+  return uint128(lhs) /= rhs;
+}
+
+inline uint128 operator%(const uint128& lhs, const uint128& rhs) {
+  return uint128(lhs) %= rhs;
+}
+
 inline uint128& uint128::operator+=(const uint128& b) {
   hi_ += b.hi_;
-  uint64_t lolo = lo_ + b.lo_;
+  uint64 lolo = lo_ + b.lo_;
   if (lolo < lo_)
     ++hi_;
   lo_ = lolo;
@@ -294,19 +333,19 @@ inline uint128& uint128::operator-=(const uint128& b) {
 }
 
 inline uint128& uint128::operator*=(const uint128& b) {
-  uint64_t a96 = hi_ >> 32;
-  uint64_t a64 = hi_ & 0xffffffffu;
-  uint64_t a32 = lo_ >> 32;
-  uint64_t a00 = lo_ & 0xffffffffu;
-  uint64_t b96 = b.hi_ >> 32;
-  uint64_t b64 = b.hi_ & 0xffffffffu;
-  uint64_t b32 = b.lo_ >> 32;
-  uint64_t b00 = b.lo_ & 0xffffffffu;
+  uint64 a96 = hi_ >> 32;
+  uint64 a64 = hi_ & 0xffffffffu;
+  uint64 a32 = lo_ >> 32;
+  uint64 a00 = lo_ & 0xffffffffu;
+  uint64 b96 = b.hi_ >> 32;
+  uint64 b64 = b.hi_ & 0xffffffffu;
+  uint64 b32 = b.lo_ >> 32;
+  uint64 b00 = b.lo_ & 0xffffffffu;
   // multiply [a96 .. a00] x [b96 .. b00]
   // terms higher than c96 disappear off the high side
   // terms c96 and c64 are safe to ignore carry bit
-  uint64_t c96 = a96 * b00 + a64 * b32 + a32 * b64 + a00 * b96;
-  uint64_t c64 = a64 * b00 + a32 * b32 + a00 * b64;
+  uint64 c96 = a96 * b00 + a64 * b32 + a32 * b64 + a00 * b96;
+  uint64 c64 = a64 * b00 + a32 * b32 + a00 * b64;
   this->hi_ = (c96 << 32) + c64;
   this->lo_ = 0;
   // add terms after this one at a time to capture carry
@@ -338,4 +377,7 @@ inline uint128& uint128::operator--() {
   return *this;
 }
 
-#endif  // NET_BASE_INT128_H_
+}  // namespace protobuf
+}  // namespace google
+
+#endif  // GOOGLE_PROTOBUF_STUBS_INT128_H_