Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified Diff: webrtc/voice_engine/test/cmd_test/voe_cmd_test.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
Index: webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index 0b5af8db935c4a11ff6328bf4a2d4bc28486dcd1..494f13f0a0ab6a7e61c12146942b93d8e7dac8f2 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -51,18 +51,18 @@ using namespace test;
printf("*** Error code = %i \n", base1->LastError()); \
}
-VoiceEngine* m_voe = NULL;
-VoEBase* base1 = NULL;
-VoECodec* codec = NULL;
-VoEVolumeControl* volume = NULL;
-VoERTP_RTCP* rtp_rtcp = NULL;
-VoEAudioProcessing* apm = NULL;
-VoENetwork* netw = NULL;
-VoEFile* file = NULL;
-VoEVideoSync* vsync = NULL;
-VoEHardware* hardware = NULL;
-VoEExternalMedia* xmedia = NULL;
-VoENetEqStats* neteqst = NULL;
+VoiceEngine* m_voe = nullptr;
+VoEBase* base1 = nullptr;
+VoECodec* codec = nullptr;
+VoEVolumeControl* volume = nullptr;
+VoERTP_RTCP* rtp_rtcp = nullptr;
+VoEAudioProcessing* apm = nullptr;
+VoENetwork* netw = nullptr;
+VoEFile* file = nullptr;
+VoEVideoSync* vsync = nullptr;
+VoEHardware* hardware = nullptr;
+VoEExternalMedia* xmedia = nullptr;
+VoENetEqStats* neteqst = nullptr;
void RunTest(std::string out_path);
@@ -146,7 +146,7 @@ int main(int argc, char** argv) {
VoiceEngine::SetTraceFilter(kTraceAll);
res = VoiceEngine::SetTraceFile(trace_filename.c_str());
VALIDATE;
- res = VoiceEngine::SetTraceCallback(NULL);
+ res = VoiceEngine::SetTraceCallback(nullptr);
VALIDATE;
printf("Outputting logs to file: %s\n", trace_filename.c_str());
}
@@ -155,7 +155,7 @@ int main(int argc, char** argv) {
res = base1->Init();
if (res != 0) {
printf("\nError calling Init: %d\n", base1->LastError());
- fflush(NULL);
+ fflush(nullptr);
exit(1);
}
@@ -238,7 +238,7 @@ void RunTest(std::string out_path) {
chan = base1->CreateChannel();
if (chan < 0) {
printf("************ Error code = %i\n", base1->LastError());
- fflush(NULL);
+ fflush(nullptr);
}
VoiceChannelTransport* voice_channel_transport(
@@ -790,7 +790,7 @@ void RunTest(std::string out_path) {
delete voice_channel_transport;
for (int i = 0; i < kMaxNumChannels; ++i) {
delete voice_channel_transports[i];
- voice_channel_transports[i] = NULL;
+ voice_channel_transports[i] = nullptr;
}
printf("Delete channels \n");

Powered by Google App Engine
This is Rietveld 408576698