webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc - Issue 2685783014: Replace NULL with nullptr in all C++ files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)

Patch Set: Fixing android. Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webrtc/base/event.cc ('K') | « webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc ('k') | webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc b/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

index a53e7bd0b560ca594deda783254b29113a18e899..5b8591a056c0bc66ff22552e57a09b9332bcb2d5 100644

--- a/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

+++ b/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

@@ -98,7 +98,7 @@ int main(int argc, char* argv[])

for(clientCntr = 0; clientCntr < NUM_CLIENTS; clientCntr++)

{

- codecInstance[clientCntr] = NULL;

+ codecInstance[clientCntr] = nullptr;

printf("\n");

printf("Client %d\n", clientCntr + 1);

@@ -135,8 +135,7 @@ int main(int argc, char* argv[])

lenAudioIn10msTmp[clientCntr] = 0;

packetData[clientCntr] = (BottleNeckModel*)new(BottleNeckModel);

- if(packetData[clientCntr] == NULL)

- {

+ if (packetData[clientCntr] == nullptr) {

printf("Could not allocate memory for packetData \n");

return -1;

}