zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using base/constructormagic.h and remove system_wrappers/interface/constructor_magic.h.

Browse Source 
Same as https://webrtc-codereview.appspot.com/19519004. The issue in
http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Linux...
is solved by this change
http://src.chromium.org/viewvc/chrome/trunk/src/third_party/libjingle/libjing...
(tested locally).

BUG=3380
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6218 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-05-21 21:18:46 +00:00
parent 99b4162ccf
commit 88fbb2d86b
83 changed files with 86 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/desktop_capture/desktop_capture_options.h
View File

@ -10,7 +10,7 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/system_wrappers/interface/scoped_refptr.h"
#if defined(USE_X11)

2
webrtc/modules/desktop_capture/desktop_geometry.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_GEOMETRY_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/typedefs.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/desktop_region.h
View File

@ -14,8 +14,8 @@
#include <map>
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h
View File

@ -14,7 +14,7 @@
#include <OpenGL/CGLMacro.h>
#include <OpenGL/OpenGL.h>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/mouse_cursor.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/shared_memory.h
View File

@ -17,8 +17,8 @@
#include <windows.h>
#endif
#include "webrtc/base/constructormagic.h"
#include "webrtc/typedefs.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc {

4
webrtc/modules/desktop_capture/win/desktop.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DESKTOP_H_
#include <string>
#include <windows.h>
#include <string>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/win/scoped_gdi_object.h
View File

@ -13,7 +13,7 @@
#include <windows.h>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
View File

@ -13,7 +13,7 @@
#include <windows.h>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {

6
webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h
View File

@ -11,16 +11,16 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_
#include <windows.h>
#include <magnification.h>
#include <wincodec.h>
#include <windows.h>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
#include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
#include "webrtc/modules/desktop_capture/screen_capturer.h"
#include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
#include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h"
#include "webrtc/system_wrappers/interface/atomic32.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {

4
webrtc/modules/desktop_capture/window_capturer.h
View File

@ -11,12 +11,12 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WINDOW_CAPTURER_H_
#include <vector>
#include <string>
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/desktop_capture/desktop_capture_types.h"
#include "webrtc/modules/desktop_capture/desktop_capturer.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/desktop_capture/x11/x_error_trap.h
View File

@ -13,7 +13,7 @@
#include <X11/Xlib.h>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
namespace webrtc {