diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
| commit | a8465b738e5a1f346ece58ea6f82612bcd6659d2 (patch) | |
| tree | b755540a5d7d2cc988eabc7ac594e6abd9da29d1 /src/google/protobuf/stubs/stringpiece.cc | |
| parent | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (diff) | |
| parent | 9bbc4b1fab8262958c172f2d8e87b486c950a051 (diff) | |
| download | protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.gz protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.bz2 protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.zip | |
Merge master branch.
Diffstat (limited to 'src/google/protobuf/stubs/stringpiece.cc')
| -rw-r--r-- | src/google/protobuf/stubs/stringpiece.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/stringpiece.cc b/src/google/protobuf/stubs/stringpiece.cc index 989474b7..96a7d3da 100644 --- a/src/google/protobuf/stubs/stringpiece.cc +++ b/src/google/protobuf/stubs/stringpiece.cc @@ -115,7 +115,7 @@ stringpiece_ssize_type StringPiece::find(char c, size_type pos) const { } const char* result = static_cast<const char*>( memchr(ptr_ + pos, c, length_ - pos)); - return result != NULL ? result - ptr_ : npos; + return result != nullptr ? result - ptr_ : npos; } stringpiece_ssize_type StringPiece::rfind(StringPiece s, size_type pos) const { |