diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-07 12:05:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 12:05:29 -0700 |
| commit | f504d95d461319ad9fc11e0925569b84a4c65d7d (patch) | |
| tree | 0d30b048b4176ec9aa7d3b14a60925cb74c6cc2b /src/google/protobuf/stubs/substitute.cc | |
| parent | 3389bd965b1fb6687056d81b069e99f8c2543cba (diff) | |
| parent | 526b350199e604b62daaee9febc5d8a8d593a010 (diff) | |
| download | protobuf-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/substitute.cc')
| -rw-r--r-- | src/google/protobuf/stubs/substitute.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/substitute.cc b/src/google/protobuf/stubs/substitute.cc index 7194a5b1..1ac9ab45 100644 --- a/src/google/protobuf/stubs/substitute.cc +++ b/src/google/protobuf/stubs/substitute.cc @@ -44,7 +44,7 @@ using internal::SubstituteArg; // to Substitute(). static int CountSubstituteArgs(const SubstituteArg* const* args_array) { int count = 0; - while (args_array[count] != NULL && args_array[count]->size() != -1) { + while (args_array[count] != nullptr && args_array[count]->size() != -1) { ++count; } return count; @@ -71,7 +71,7 @@ void SubstituteAndAppend( const SubstituteArg& arg6, const SubstituteArg& arg7, const SubstituteArg& arg8, const SubstituteArg& arg9) { const SubstituteArg* const args_array[] = { - &arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, NULL + &arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, nullptr }; // Determine total size needed. |