Switch C++-style C headers with their C equivalents.
The C++ headers define the C functions within the std:: namespace, but we mainly don't use the std:: namespace for C functions. Therefore we should include the C headers. BUG=1833 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1917004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4486 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -10,8 +10,9 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/source/nack.h"
|
||||
|
||||
#include <assert.h> // For assert.
|
||||
|
||||
#include <algorithm> // For std::max.
|
||||
#include <cassert> // For assert.
|
||||
|
||||
#include "webrtc/modules/interface/module_common_types.h"
|
||||
#include "webrtc/system_wrappers/interface/logging.h"
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/test/APITest.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <cctype>
|
||||
#include <iostream>
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "PCMFile.h"
|
||||
|
||||
#include <cctype>
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "module_common_types.h"
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
|
||||
#include "TestFEC.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "audio_coding_module_typedefs.h"
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/test/TestStereo.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
#include "typedefs.h"
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
class TimedTrace {
|
||||
public:
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "TwoWayCommunication.h"
|
||||
|
||||
#include <cctype>
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
#include "gflags/gflags.h"
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/test/iSACTest.h"
|
||||
|
||||
#include <cctype>
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#if _WIN32
|
||||
#include <windows.h>
|
||||
#elif WEBRTC_LINUX
|
||||
#include <ctime>
|
||||
#include <time.h>
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
@@ -10,7 +10,8 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/main/test/opus_test.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
@@ -35,14 +35,14 @@
|
||||
#include <vector>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#ifdef WEBRTC_LINUX
|
||||
#include <netinet/in.h>
|
||||
#include <assert.h>
|
||||
#include <libgen.h>
|
||||
#include <cassert>
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
//#include "vld.h"
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
//TODO(hlundin): Reformat file to meet style guide.
|
||||
|
||||
/* header includes */
|
||||
#include "typedefs.h"
|
||||
#include "stdio.h"
|
||||
#include "typedefs.h"
|
||||
#include "webrtc_neteq.h" // needed for enum WebRtcNetEQDecoder
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <cassert>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <winsock2.h>
|
||||
|
||||
@@ -11,8 +11,7 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include <cstring> // memmove
|
||||
#include <string.h> // memmove
|
||||
|
||||
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
|
||||
#include "webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
|
||||
|
||||
#include <cstring> // Access to size_t.
|
||||
#include <string.h> // Access to size_t.
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
|
||||
|
||||
#include <cstring> // Access to size_t.
|
||||
#include <string.h> // Access to size_t.
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h> // memcpy
|
||||
|
||||
#include <algorithm> // min, max
|
||||
#include <cstring> // memcpy
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
|
||||
|
||||
#include <cstring> // size_t
|
||||
#include <string.h> // size_t
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
|
||||
|
||||
#include <cmath> // Access to pow function.
|
||||
#include <math.h> // Access to pow function.
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
|
||||
|
||||
#include <cstring> // Provide access to size_t.
|
||||
#include <string.h> // Provide access to size_t.
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
|
||||
|
||||
#include <cstring> // size_t
|
||||
#include <string.h> // size_t
|
||||
|
||||
#include <list>
|
||||
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h> // Access to memset.
|
||||
|
||||
#include <algorithm> // Access to min, max.
|
||||
#include <cstring> // Access to memset.
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
|
||||
|
||||
#include <cstring> // Access to size_t.
|
||||
#include <string.h> // Access to size_t.
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <math.h>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/expand.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h> // memset
|
||||
|
||||
#include <algorithm> // min, max
|
||||
#include <cstring> // memset
|
||||
#include <limits> // numeric_limits<T>
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
|
||||
|
||||
#include <cstring> // Provide access to size_t.
|
||||
#include <string.h> // Provide access to size_t.
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/merge.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h> // memmove, memcpy, memset, size_t
|
||||
|
||||
#include <algorithm> // min, max
|
||||
#include <cstring> // memmove, memcpy, memset, size_t
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
|
||||
@@ -10,8 +10,9 @@
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/normal.h"
|
||||
|
||||
#include <string.h> // memset, memcpy
|
||||
|
||||
#include <algorithm> // min
|
||||
#include <cstring> // memset, memcpy
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
|
||||
|
||||
#include <cstring> // Access to size_t.
|
||||
#include <string.h> // Access to size_t.
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
|
||||
|
||||
#include <cstring> // size_t
|
||||
#include <string.h> // size_t
|
||||
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
@@ -11,8 +11,7 @@
|
||||
#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include <cstring> // memset
|
||||
#include <string.h> // memset
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
|
||||
#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
|
||||
#include "webrtc/typedefs.h"
|
||||
// needed for NetEqDecoder
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#include <cassert>
|
||||
#include <assert.h>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include <cstring> // memset, size_t
|
||||
#include <string.h> // memset, size_t
|
||||
|
||||
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
|
||||
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
|
||||
|
||||
#include <cstdio>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "webrtc/system_wrappers/interface/constructor_magic.h"
|
||||
|
||||
@@ -8,9 +8,10 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <cstdio>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user