Replace basictypes.h with stdint.h for int_t types.

Removes basictypes.h for types that only makes use of it for fixed-size-int typedefs and replaces it with stdint.h. BUG=webrtc:6853 R=tommi@webrtc.org Review-Url: https://codereview.webrtc.org/2604043002 Cr-Commit-Position: refs/heads/master@{#15867}
2017-01-02 06:58:46 -08:00
parent 23351197fb
commit 7fd1a75300
31 changed files with 63 additions and 35 deletions
--- a/webrtc/api/rtpreceiver.h
+++ b/webrtc/api/rtpreceiver.h
@ -15,13 +15,14 @@
 #ifndef WEBRTC_API_RTPRECEIVER_H_
 #define WEBRTC_API_RTPRECEIVER_H_

+#include <stdint.h>
+
 #include <string>

 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/remoteaudiosource.h"
 #include "webrtc/api/videotracksource.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/videobroadcaster.h"
 #include "webrtc/pc/channel.h"
--- a/webrtc/base/byteorder_unittest.cc
+++ b/webrtc/base/byteorder_unittest.cc
@ -8,9 +8,9 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "webrtc/base/byteorder.h"
+#include <stdint.h>

-#include "webrtc/base/basictypes.h"
+#include "webrtc/base/byteorder.h"
 #include "webrtc/base/gunit.h"

 namespace rtc {
--- a/webrtc/base/network.h
+++ b/webrtc/base/network.h
@ -11,13 +11,14 @@
 #ifndef WEBRTC_BASE_NETWORK_H_
 #define WEBRTC_BASE_NETWORK_H_

+#include <stdint.h>
+
 #include <deque>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/ipaddress.h"
 #include "webrtc/base/networkmonitor.h"
 #include "webrtc/base/messagehandler.h"
--- a/webrtc/base/rtccertificate.h
+++ b/webrtc/base/rtccertificate.h
@ -11,9 +11,10 @@
 #ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
 #define WEBRTC_BASE_RTCCERTIFICATE_H_

+#include <stdint.h>
+
 #include <memory>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/sslidentity.h"
--- a/webrtc/base/systeminfo.h
+++ b/webrtc/base/systeminfo.h
@ -11,9 +11,9 @@
 #ifndef WEBRTC_BASE_SYSTEMINFO_H__
 #define WEBRTC_BASE_SYSTEMINFO_H__

-#include <string>
+#include <stdint.h>

-#include "webrtc/base/basictypes.h"
+#include <string>

 namespace rtc {

--- a/webrtc/base/task.h
+++ b/webrtc/base/task.h
@ -11,8 +11,10 @@
 #ifndef WEBRTC_BASE_TASK_H__
 #define WEBRTC_BASE_TASK_H__

+#include <stdint.h>
+
 #include <string>
-#include "webrtc/base/basictypes.h"
+
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/taskparent.h"

--- a/webrtc/base/taskrunner.h
+++ b/webrtc/base/taskrunner.h
@ -11,9 +11,10 @@
 #ifndef WEBRTC_BASE_TASKRUNNER_H__
 #define WEBRTC_BASE_TASKRUNNER_H__

+#include <stdint.h>
+
 #include <vector>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/taskparent.h"

--- a/webrtc/base/timedelta.h
+++ b/webrtc/base/timedelta.h
@ -11,7 +11,8 @@
 #ifndef WEBRTC_BASE_TIMEDELTA_H_
 #define WEBRTC_BASE_TIMEDELTA_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/base/timeutils.h"

 // Convenience class to convert between different units of relative time.
--- a/webrtc/base/timestampaligner.h
+++ b/webrtc/base/timestampaligner.h
@ -11,7 +11,8 @@
 #ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_
 #define WEBRTC_BASE_TIMESTAMPALIGNER_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/base/constructormagic.h"

 namespace rtc {
--- a/webrtc/base/timeutils.h
+++ b/webrtc/base/timeutils.h
@ -11,10 +11,10 @@
 #ifndef WEBRTC_BASE_TIMEUTILS_H_
 #define WEBRTC_BASE_TIMEUTILS_H_

-#include <ctime>
+#include <stdint.h>
 #include <time.h>

-#include "webrtc/base/basictypes.h"
+#include <ctime>

 namespace rtc {

--- a/webrtc/base/window.h
+++ b/webrtc/base/window.h
@ -11,7 +11,8 @@
 #ifndef WEBRTC_BASE_WINDOW_H_
 #define WEBRTC_BASE_WINDOW_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/base/stringencode.h"

 // Define platform specific window types.
--- a/webrtc/call/flexfec_receive_stream.h
+++ b/webrtc/call/flexfec_receive_stream.h
@ -11,6 +11,8 @@
 #ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_
 #define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_

+#include <stdint.h>
+
 #include <string>
 #include <vector>

--- a/webrtc/call/flexfec_receive_stream_unittest.cc
+++ b/webrtc/call/flexfec_receive_stream_unittest.cc
@ -8,8 +8,9 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

+#include <stdint.h>
+
 #include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/call/flexfec_receive_stream_impl.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
--- a/webrtc/examples/peerconnection/client/defaults.h
+++ b/webrtc/examples/peerconnection/client/defaults.h
@ -12,9 +12,9 @@
 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_
 #pragma once

-#include <string>
+#include <stdint.h>

-#include "webrtc/base/basictypes.h"
+#include <string>

 extern const char kAudioLabel[];
 extern const char kVideoLabel[];
--- a/webrtc/media/base/streamparams.h
+++ b/webrtc/media/base/streamparams.h
@ -26,12 +26,13 @@
 #ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
 #define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_

+#include <stdint.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"

 namespace cricket {
--- a/webrtc/media/base/videocapturer.h
+++ b/webrtc/media/base/videocapturer.h
@ -13,12 +13,13 @@
 #ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
 #define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_

+#include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/media/base/videosourceinterface.h"
--- a/webrtc/media/base/videocommon.h
+++ b/webrtc/media/base/videocommon.h
@ -13,9 +13,10 @@
 #ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_  // NOLINT
 #define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_

+#include <stdint.h>
+
 #include <string>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/timeutils.h"

 namespace cricket {
--- a/webrtc/media/devices/gtkvideorenderer.h
+++ b/webrtc/media/devices/gtkvideorenderer.h
@ -14,9 +14,10 @@
 #ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
 #define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_

+#include <stdint.h>
+
 #include <memory>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/media/base/videosinkinterface.h"

 typedef struct _GtkWidget GtkWidget;  // forward declaration, defined in gtk.h
--- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
+++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
@ -11,7 +11,8 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module_common_types.h"
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
@ -10,7 +10,8 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"

--- a/webrtc/modules/rtp_rtcp/source/time_util.h
+++ b/webrtc/modules/rtp_rtcp/source/time_util.h
@ -11,7 +11,8 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/system_wrappers/include/ntp_time.h"

 namespace webrtc {
--- a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
+++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
@ -10,8 +10,10 @@

 #include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"

+#include <stdint.h>
+
 #include <vector>
-#include "webrtc/base/basictypes.h"
+
 #include "webrtc/test/gtest.h"

 namespace webrtc {
--- a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
+++ b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
@ -9,8 +9,8 @@
 */

 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
+
+#include <stdint.h>

 namespace webrtc {

--- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
+++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
@ -11,10 +11,11 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
 #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_

+#include <stdint.h>
+
 #include <map>
 #include <memory>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
--- a/webrtc/p2p/base/candidate.h
+++ b/webrtc/p2p/base/candidate.h
@ -13,6 +13,7 @@

 #include <limits.h>
 #include <math.h>
+#include <stdint.h>

 #include <algorithm>
 #include <iomanip>
@ -20,7 +21,6 @@
 #include <string>

 #include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/socketaddress.h"
--- a/webrtc/p2p/stunprober/stunprober_unittest.cc
+++ b/webrtc/p2p/stunprober/stunprober_unittest.cc
@ -8,10 +8,11 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

+#include <stdint.h>
+
 #include <memory>

 #include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gunit.h"
--- a/webrtc/pc/currentspeakermonitor.h
+++ b/webrtc/pc/currentspeakermonitor.h
@ -14,9 +14,10 @@
 #ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
 #define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_

+#include <stdint.h>
+
 #include <map>

-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/sigslot.h"

 namespace cricket {
--- a/webrtc/pc/externalhmac.h
+++ b/webrtc/pc/externalhmac.h
@ -28,7 +28,8 @@
 // functions and the corresponding authentication id using
 // crypto_kernel_replace_auth_type function.

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #ifdef HAVE_SRTP
 #include "third_party/libsrtp/crypto/include/auth.h"
 #endif  // HAVE_SRTP
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
@ -13,10 +13,11 @@

 #include "webrtc/base/networkmonitor.h"

+#include <stdint.h>
+
 #include <map>

 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/thread_checker.h"

 namespace webrtc_jni {
--- a/webrtc/system_wrappers/include/ntp_time.h
+++ b/webrtc/system_wrappers/include/ntp_time.h
@ -10,7 +10,8 @@
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/system_wrappers/include/clock.h"

 namespace webrtc {
--- a/webrtc/test/frame_utils.h
+++ b/webrtc/test/frame_utils.h
@ -10,7 +10,8 @@
 #ifndef WEBRTC_TEST_FRAME_UTILS_H_
 #define WEBRTC_TEST_FRAME_UTILS_H_

-#include "webrtc/base/basictypes.h"
+#include <stdint.h>
+
 #include "webrtc/base/scoped_ref_ptr.h"

 namespace webrtc {