aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs/stl_util.h
diff options
context:
space:
mode:
authorDhruv <dhruv.batra@hotmail.com>2018-08-06 23:10:16 +0800
committerDhruv <dhruv.batra@hotmail.com>2018-08-07 08:03:57 +0800
commit526b350199e604b62daaee9febc5d8a8d593a010 (patch)
treeb5b0408408979675429fab071c5ce1cae1313a54 /src/google/protobuf/stubs/stl_util.h
parente9a5412afcb5035c02136ba65210bf2cb69d9ab5 (diff)
downloadprotobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.gz
protobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.bz2
protobuf-526b350199e604b62daaee9febc5d8a8d593a010.zip
4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs
Diffstat (limited to 'src/google/protobuf/stubs/stl_util.h')
-rw-r--r--src/google/protobuf/stubs/stl_util.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/stl_util.h b/src/google/protobuf/stubs/stl_util.h
index 9e4c82a4..2c265e92 100644
--- a/src/google/protobuf/stubs/stl_util.h
+++ b/src/google/protobuf/stubs/stl_util.h
@@ -82,7 +82,7 @@ inline void STLStringResizeUninitialized(string* s, size_t new_size) {
// already work on all current implementations.
inline char* string_as_array(string* str) {
// DO NOT USE const_cast<char*>(str->data())! See the unittest for why.
- return str->empty() ? NULL : &*str->begin();
+ return str->empty() ? nullptr : &*str->begin();
}
// STLDeleteElements() deletes all the elements in an STL container and clears
@@ -90,7 +90,7 @@ inline char* string_as_array(string* str) {
// hash_set, or any other STL container which defines sensible begin(), end(),
// and clear() methods.
//
-// If container is NULL, this function is a no-op.
+// If container is nullptr, this function is a no-op.
//
// As an alternative to calling STLDeleteElements() directly, consider
// ElementDeleter (defined below), which ensures that your container's elements
@@ -104,7 +104,7 @@ void STLDeleteElements(T *container) {
// Given an STL container consisting of (key, value) pairs, STLDeleteValues
// deletes all the "value" components and clears the container. Does nothing
-// in the case it's given a NULL pointer.
+// in the case it's given a null pointer.
template <class T>
void STLDeleteValues(T *v) {