aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs/strutil.h
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2018-08-07 12:05:29 -0700
committerGitHub <noreply@github.com>2018-08-07 12:05:29 -0700
commitf504d95d461319ad9fc11e0925569b84a4c65d7d (patch)
tree0d30b048b4176ec9aa7d3b14a60925cb74c6cc2b /src/google/protobuf/stubs/strutil.h
parent3389bd965b1fb6687056d81b069e99f8c2543cba (diff)
parent526b350199e604b62daaee9febc5d8a8d593a010 (diff)
downloadprotobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.gz
protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.bz2
protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.zip
Merge pull request #5010 from batradhruv/4593
#4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
Diffstat (limited to 'src/google/protobuf/stubs/strutil.h')
-rw-r--r--src/google/protobuf/stubs/strutil.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/strutil.h b/src/google/protobuf/stubs/strutil.h
index a839b8b3..e34b9988 100644
--- a/src/google/protobuf/stubs/strutil.h
+++ b/src/google/protobuf/stubs/strutil.h
@@ -285,7 +285,7 @@ inline string JoinStrings(const std::vector<string>& components,
//
// Errors: In the first form of the call, errors are reported with
// LOG(ERROR). The same is true for the second form of the call if
-// the pointer to the string std::vector is NULL; otherwise, error
+// the pointer to the string std::vector is nullptr; otherwise, error
// messages are stored in the std::vector. In either case, the effect on
// the dest array is not defined, but rest of the source will be
// processed.
@@ -304,7 +304,7 @@ LIBPROTOBUF_EXPORT int UnescapeCEscapeSequences(const char* source, char* dest,
// to be the same.
//
// The second call stores its errors in a supplied string vector.
-// If the string vector pointer is NULL, it reports the errors with LOG().
+// If the string vector pointer is nullptr, it reports the errors with LOG().
//
// In the first and second calls, the length of dest is returned. In the
// the third call, the new string is returned.