about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-02-13T06·10-0800
committerMark Barolak <mbar@google.com>2018-02-13T20·23-0500
commit055cc7dce10aa6bd7cc2ef64e0fe453fb792da62 (patch)
treeb16e0da1c6506c64b11f2a7ac78c55a90c96235c
parent0dc82b9d55e1616c1745d05973d40c9901903cc9 (diff)
Changes imported from Abseil "staging" branch:
  - d79c005bda08783cd496c41dbd51a5d7e520c9e2 Fix typo in ByLength example (comment). by Abseil Team <absl-team@google.com>
  - 0751d4f0e61f70e50f4771ca9843bd90895ec0bc Enable RAW_LOG on NaCl via POSIX write(), which it suppor... by Abseil Team <absl-team@google.com>
  - 4a63f87b9b1c9d738da21fc0ffa638876a12facf Remove use of assert() in .h and .inc files to reduce cha... by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: d79c005bda08783cd496c41dbd51a5d7e520c9e2
Change-Id: I0c5d064faa1b8e6b703d388af2b8957cc906dd7f
-rw-r--r--absl/base/internal/raw_logging.cc2
-rw-r--r--absl/numeric/int128.h6
-rw-r--r--absl/strings/str_split.h2
3 files changed, 2 insertions, 8 deletions
diff --git a/absl/base/internal/raw_logging.cc b/absl/base/internal/raw_logging.cc
index 7a32edded4ec..a332ec73b8f5 100644
--- a/absl/base/internal/raw_logging.cc
+++ b/absl/base/internal/raw_logging.cc
@@ -36,7 +36,7 @@
 // This preprocessor token is also defined in raw_io.cc.  If you need to copy
 // this, consider moving both to config.h instead.
 #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-    defined(__Fuchsia__)
+    defined(__Fuchsia__) || defined(__native_client__)
 #include <unistd.h>
 
 
diff --git a/absl/numeric/int128.h b/absl/numeric/int128.h
index 11ecc8bcbd3c..2eded2f3b549 100644
--- a/absl/numeric/int128.h
+++ b/absl/numeric/int128.h
@@ -548,9 +548,6 @@ inline uint128& uint128::operator^=(uint128 other) {
 // Arithmetic operators.
 
 inline uint128 operator<<(uint128 lhs, int amount) {
-  assert(amount >= 0);   // Negative shifts are undefined.
-  assert(amount < 128);  // Shifts of >= 128 are undefined.
-
   // uint64_t shifts of >= 64 are undefined, so we will need some
   // special-casing.
   if (amount < 64) {
@@ -565,9 +562,6 @@ inline uint128 operator<<(uint128 lhs, int amount) {
 }
 
 inline uint128 operator>>(uint128 lhs, int amount) {
-  assert(amount >= 0);   // Negative shifts are undefined.
-  assert(amount < 128);  // Shifts of >= 128 are undefined.
-
   // uint64_t shifts of >= 64 are undefined, so we will need some
   // special-casing.
   if (amount < 64) {
diff --git a/absl/strings/str_split.h b/absl/strings/str_split.h
index 5b3d6a8a91ea..713fdd0e6757 100644
--- a/absl/strings/str_split.h
+++ b/absl/strings/str_split.h
@@ -208,7 +208,7 @@ class ByAnyChar {
 //   using absl::ByLength;
 //   std::vector<std::string> v = absl::StrSplit("12345", ByLength(2));
 //
-//   // v[0] == "12", v[1] == "35", v[2] == "5"
+//   // v[0] == "12", v[1] == "34", v[2] == "5"
 class ByLength {
  public:
   explicit ByLength(ptrdiff_t length);