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/audio_coding/neteq4/accelerate.h
View File

@ -13,9 +13,9 @@
#include <assert.h>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h
View File

@ -18,8 +18,8 @@
// selection is made in the gypi file instead of in engine_configurations.h.
#include "webrtc/engine_configurations.h"
#endif
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
View File

@ -15,8 +15,8 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/audio_vector.h
View File

@ -13,7 +13,7 @@
#include <string.h> // Access to size_t.
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"

2
webrtc/modules/audio_coding/neteq4/background_noise.h
View File

@ -13,9 +13,9 @@
#include <string.h> // size_t
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"

2
webrtc/modules/audio_coding/neteq4/buffer_level_filter.h
View File

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

2
webrtc/modules/audio_coding/neteq4/comfort_noise.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_COMFORT_NOISE_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/decision_logic.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/defines.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/decision_logic_fax.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_FAX_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/decision_logic_normal.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DECISION_LOGIC_NORMAL_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/decoder_database.h
View File

@ -13,10 +13,10 @@
#include <map>
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h" // NULL
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/modules/audio_coding/neteq4/packet.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/delay_manager.h
View File

@ -15,8 +15,8 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
View File

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

2
webrtc/modules/audio_coding/neteq4/dsp_helper.h
View File

@ -13,8 +13,8 @@
#include <string.h> // Access to size_t.
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/dtmf_buffer.h
View File

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

2
webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h
View File

@ -12,8 +12,8 @@
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DTMF_TONE_GENERATOR_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/expand.h
View File

@ -13,8 +13,8 @@
#include <assert.h>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"

2
webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h
View File

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

2
webrtc/modules/audio_coding/neteq4/interface/neteq.h
View File

@ -15,9 +15,9 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/merge.h
View File

@ -13,8 +13,8 @@
#include <assert.h>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h
View File

@ -14,8 +14,8 @@
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "gmock/gmock.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/neteq_impl.h
View File

@ -13,6 +13,7 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq4/defines.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
@ -20,7 +21,6 @@
#include "webrtc/modules/audio_coding/neteq4/random_vector.h"
#include "webrtc/modules/audio_coding/neteq4/rtcp.h"
#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/thread_annotations.h"
#include "webrtc/typedefs.h"

2
webrtc/modules/audio_coding/neteq4/normal.h
View File

@ -15,9 +15,9 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq4/defines.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/packet_buffer.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PACKET_BUFFER_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/packet.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/payload_splitter.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_PAYLOAD_SPLITTER_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/packet.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/post_decode_vad.h
View File

@ -13,12 +13,12 @@
#include <string> // size_t
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_audio/vad/include/webrtc_vad.h"
#include "webrtc/common_types.h" // NULL
#include "webrtc/modules/audio_coding/neteq4/defines.h"
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/modules/audio_coding/neteq4/packet.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/preemptive_expand.h
View File

@ -13,9 +13,9 @@
#include <assert.h>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq4/time_stretch.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/random_vector.h
View File

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

2
webrtc/modules/audio_coding/neteq4/rtcp.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RTCP_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/statistics_calculator.h
View File

@ -13,8 +13,8 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/sync_buffer.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_SYNC_BUFFER_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/time_stretch.h
View File

@ -14,8 +14,8 @@
#include <assert.h>
#include <string.h> // memset, size_t
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/timestamp_scaler.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIMESTAMP_SCALER_H_
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/neteq4/packet.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/tools/audio_loop.h
View File

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

2
webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
View File

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

2
webrtc/modules/audio_coding/neteq4/tools/packet.h
View File

@ -13,8 +13,8 @@
#include <list>
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"

2
webrtc/modules/audio_coding/neteq4/tools/packet_source.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_PACKET_SOURCE_H_
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/base/constructormagic.h"
namespace webrtc {
namespace test {

2
webrtc/modules/audio_coding/neteq4/tools/rtp_file_source.h
View File

@ -14,10 +14,10 @@
#include <stdio.h>
#include <string>
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/neteq4/tools/packet_source.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {

2
webrtc/modules/audio_coding/neteq4/tools/rtp_generator.h
View File

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