generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't rely on webrtc/base/scoped_ptr.h to include stuff for you

Browse Source 
webrtc/base/scoped_ptr.h doesn't need to include webrtc/base/common.h
anymore, but a couple of its users were relying on it to pull in other
things for them. Fix that, and remove the now really unnecessary
webrtc/base/common.h include.

R=andrew@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/37169004

Cr-Commit-Position: refs/heads/master@{#8333}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8333 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org 2015-02-11 14:30:34 +00:00
parent fbcb5ceb16
commit 11426dc719
7 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
talk/media/devices/mobiledevicemanager.cc
View File

@ -26,6 +26,7 @@
*/
#include "talk/media/devices/devicemanager.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
namespace cricket {
@ -56,7 +57,7 @@ bool MobileDeviceManager::GetVideoCaptureDevices(std::vector<Device>* devs) {
char id[256];
char name[256];
for (uint32 i = 0; i < num_cams; ++i) {
if (info->GetDeviceName(i, name, ARRAY_SIZE(name), id, ARRAY_SIZE(id)))
if (info->GetDeviceName(i, name, arraysize(name), id, arraysize(id)))
continue;
devs->push_back(Device(name, id));
}

1
webrtc/base/buffer.h
View File

@ -13,6 +13,7 @@
#include <string.h>
#include "webrtc/base/common.h"
#include "webrtc/base/scoped_ptr.h"
namespace rtc {

1
webrtc/base/messagedigest.cc
View File

@ -12,6 +12,7 @@
#include <string.h>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/sslconfig.h"
#if SSL_USE_OPENSSL
#include "webrtc/base/openssldigest.h"

1
webrtc/base/scoped_ptr.h
View File

@ -104,7 +104,6 @@
#include <algorithm> // For std::swap().
#include "webrtc/base/common.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/move.h"
#include "webrtc/base/template_util.h"

1
webrtc/base/taskparent.cc
View File

@ -12,6 +12,7 @@
#include "webrtc/base/taskparent.h"
#include "webrtc/base/common.h"
#include "webrtc/base/task.h"
#include "webrtc/base/taskrunner.h"

3
webrtc/modules/audio_device/mac/audio_device_mac.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/base/arraysize.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
@ -3213,7 +3214,7 @@ bool AudioDeviceMac::KeyPressed() {
bool key_down = false;
// Loop through all Mac virtual key constant values.
for (unsigned int key_index = 0;
key_index < ARRAY_SIZE(prev_key_state_);
key_index < arraysize(prev_key_state_);
++key_index) {
bool keyState = CGEventSourceKeyState(
kCGEventSourceStateHIDSystemState,

4
webrtc/modules/utility/source/process_thread_impl_unittest.cc
View File

@ -155,7 +155,7 @@ void ProcessCallAfterAFewMs(int64_t milliseconds) {
// thereof), can make the test run in "0"ms time.
EXPECT_GE(called_time, start_time);
// Check for an acceptable range.
uint32 diff = called_time - start_time;
uint32_t diff = called_time - start_time;
EXPECT_GE(diff, milliseconds - 15);
EXPECT_LT(diff, milliseconds + 15);
}
@ -247,7 +247,7 @@ TEST(ProcessThreadImpl, WakeUp) {
ASSERT_GT(start_time, 0);
ASSERT_GT(called_time, 0);
EXPECT_GE(called_time, start_time);
uint32 diff = called_time - start_time;
uint32_t diff = called_time - start_time;
// We should have been called back much quicker than 1sec.
EXPECT_LE(diff, 100u);
}