diff options
83 files changed, 86 insertions, 136 deletions
diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h index 7c804fea..df724e2e 100644 --- a/common_audio/resampler/push_sinc_resampler.h +++ b/common_audio/resampler/push_sinc_resampler.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ #define WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h index 8f4d079c..71ade798 100644 --- a/common_audio/resampler/sinc_resampler.h +++ b/common_audio/resampler/sinc_resampler.h @@ -14,8 +14,8 @@ #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/aligned_malloc.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/gtest_prod_util.h" #include "webrtc/typedefs.h" diff --git a/common_audio/resampler/sinusoidal_linear_chirp_source.h b/common_audio/resampler/sinusoidal_linear_chirp_source.h index 6a5cbf5c..7e9fe75e 100644 --- a/common_audio/resampler/sinusoidal_linear_chirp_source.h +++ b/common_audio/resampler/sinusoidal_linear_chirp_source.h @@ -14,8 +14,8 @@ #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/accelerate.h b/modules/audio_coding/neteq4/accelerate.h index 81f1abb5..0ee69520 100644 --- a/modules/audio_coding/neteq4/accelerate.h +++ b/modules/audio_coding/neteq4/accelerate.h @@ -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 { diff --git a/modules/audio_coding/neteq4/audio_decoder_impl.h b/modules/audio_coding/neteq4/audio_decoder_impl.h index 5df649a2..93f6c9c6 100644 --- a/modules/audio_coding/neteq4/audio_decoder_impl.h +++ b/modules/audio_coding/neteq4/audio_decoder_impl.h @@ -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 { diff --git a/modules/audio_coding/neteq4/audio_multi_vector.h b/modules/audio_coding/neteq4/audio_multi_vector.h index 2d0a7494..25f45cf2 100644 --- a/modules/audio_coding/neteq4/audio_multi_vector.h +++ b/modules/audio_coding/neteq4/audio_multi_vector.h @@ -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 { diff --git a/modules/audio_coding/neteq4/audio_vector.h b/modules/audio_coding/neteq4/audio_vector.h index 66bd518a..265d68e8 100644 --- a/modules/audio_coding/neteq4/audio_vector.h +++ b/modules/audio_coding/neteq4/audio_vector.h @@ -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" diff --git a/modules/audio_coding/neteq4/background_noise.h b/modules/audio_coding/neteq4/background_noise.h index 141d71dc..3a63ebb9 100644 --- a/modules/audio_coding/neteq4/background_noise.h +++ b/modules/audio_coding/neteq4/background_noise.h @@ -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" diff --git a/modules/audio_coding/neteq4/buffer_level_filter.h b/modules/audio_coding/neteq4/buffer_level_filter.h index 282ab7a2..842634c5 100644 --- a/modules/audio_coding/neteq4/buffer_level_filter.h +++ b/modules/audio_coding/neteq4/buffer_level_filter.h @@ -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 { diff --git a/modules/audio_coding/neteq4/comfort_noise.h b/modules/audio_coding/neteq4/comfort_noise.h index 7e7c294f..5c4e1ce0 100644 --- a/modules/audio_coding/neteq4/comfort_noise.h +++ b/modules/audio_coding/neteq4/comfort_noise.h @@ -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 { diff --git a/modules/audio_coding/neteq4/decision_logic.h b/modules/audio_coding/neteq4/decision_logic.h index e187449b..38be6e6b 100644 --- a/modules/audio_coding/neteq4/decision_logic.h +++ b/modules/audio_coding/neteq4/decision_logic.h @@ -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 { diff --git a/modules/audio_coding/neteq4/decision_logic_fax.h b/modules/audio_coding/neteq4/decision_logic_fax.h index 1ccd3524..2e35d266 100644 --- a/modules/audio_coding/neteq4/decision_logic_fax.h +++ b/modules/audio_coding/neteq4/decision_logic_fax.h @@ -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 { diff --git a/modules/audio_coding/neteq4/decision_logic_normal.h b/modules/audio_coding/neteq4/decision_logic_normal.h index 8ec60349..5b21193c 100644 --- a/modules/audio_coding/neteq4/decision_logic_normal.h +++ b/modules/audio_coding/neteq4/decision_logic_normal.h @@ -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 { diff --git a/modules/audio_coding/neteq4/decoder_database.h b/modules/audio_coding/neteq4/decoder_database.h index 9effd525..2e8825ae 100644 --- a/modules/audio_coding/neteq4/decoder_database.h +++ b/modules/audio_coding/neteq4/decoder_database.h @@ -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 { diff --git a/modules/audio_coding/neteq4/delay_manager.h b/modules/audio_coding/neteq4/delay_manager.h index ed1e87b1..cc34352b 100644 --- a/modules/audio_coding/neteq4/delay_manager.h +++ b/modules/audio_coding/neteq4/delay_manager.h @@ -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 { diff --git a/modules/audio_coding/neteq4/delay_peak_detector.h b/modules/audio_coding/neteq4/delay_peak_detector.h index dfdd2537..59d27bc5 100644 --- a/modules/audio_coding/neteq4/delay_peak_detector.h +++ b/modules/audio_coding/neteq4/delay_peak_detector.h @@ -15,7 +15,7 @@ #include <list> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" namespace webrtc { diff --git a/modules/audio_coding/neteq4/dsp_helper.h b/modules/audio_coding/neteq4/dsp_helper.h index 60cd995d..f2064858 100644 --- a/modules/audio_coding/neteq4/dsp_helper.h +++ b/modules/audio_coding/neteq4/dsp_helper.h @@ -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 { diff --git a/modules/audio_coding/neteq4/dtmf_buffer.h b/modules/audio_coding/neteq4/dtmf_buffer.h index d08b64f4..b901a971 100644 --- a/modules/audio_coding/neteq4/dtmf_buffer.h +++ b/modules/audio_coding/neteq4/dtmf_buffer.h @@ -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 { diff --git a/modules/audio_coding/neteq4/dtmf_tone_generator.h b/modules/audio_coding/neteq4/dtmf_tone_generator.h index e93f0b88..a0a83f1b 100644 --- a/modules/audio_coding/neteq4/dtmf_tone_generator.h +++ b/modules/audio_coding/neteq4/dtmf_tone_generator.h @@ -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 { diff --git a/modules/audio_coding/neteq4/expand.h b/modules/audio_coding/neteq4/expand.h index 6962aa04..b5f44065 100644 --- a/modules/audio_coding/neteq4/expand.h +++ b/modules/audio_coding/neteq4/expand.h @@ -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" diff --git a/modules/audio_coding/neteq4/interface/audio_decoder.h b/modules/audio_coding/neteq4/interface/audio_decoder.h index 6b4b1912..404572aa 100644 --- a/modules/audio_coding/neteq4/interface/audio_decoder.h +++ b/modules/audio_coding/neteq4/interface/audio_decoder.h @@ -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 { diff --git a/modules/audio_coding/neteq4/interface/neteq.h b/modules/audio_coding/neteq4/interface/neteq.h index 64a23e82..763da31b 100644 --- a/modules/audio_coding/neteq4/interface/neteq.h +++ b/modules/audio_coding/neteq4/interface/neteq.h @@ -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 { diff --git a/modules/audio_coding/neteq4/merge.h b/modules/audio_coding/neteq4/merge.h index 213b4871..012e0af7 100644 --- a/modules/audio_coding/neteq4/merge.h +++ b/modules/audio_coding/neteq4/merge.h @@ -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 { diff --git a/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h index efc0c715..b13affe1 100644 --- a/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h +++ b/modules/audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h @@ -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 { diff --git a/modules/audio_coding/neteq4/neteq_impl.h b/modules/audio_coding/neteq4/neteq_impl.h index b8139acf..9b155fe8 100644 --- a/modules/audio_coding/neteq4/neteq_impl.h +++ b/modules/audio_coding/neteq4/neteq_impl.h @@ -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" diff --git a/modules/audio_coding/neteq4/normal.h b/modules/audio_coding/neteq4/normal.h index df283198..1be5c7fd 100644 --- a/modules/audio_coding/neteq4/normal.h +++ b/modules/audio_coding/neteq4/normal.h @@ -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 { diff --git a/modules/audio_coding/neteq4/packet_buffer.h b/modules/audio_coding/neteq4/packet_buffer.h index 3d22ad06..3b068c3a 100644 --- a/modules/audio_coding/neteq4/packet_buffer.h +++ b/modules/audio_coding/neteq4/packet_buffer.h @@ -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 { diff --git a/modules/audio_coding/neteq4/payload_splitter.h b/modules/audio_coding/neteq4/payload_splitter.h index 0f6caed8..5086409a 100644 --- a/modules/audio_coding/neteq4/payload_splitter.h +++ b/modules/audio_coding/neteq4/payload_splitter.h @@ -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 { diff --git a/modules/audio_coding/neteq4/post_decode_vad.h b/modules/audio_coding/neteq4/post_decode_vad.h index eb197d9e..327de1aa 100644 --- a/modules/audio_coding/neteq4/post_decode_vad.h +++ b/modules/audio_coding/neteq4/post_decode_vad.h @@ -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 { diff --git a/modules/audio_coding/neteq4/preemptive_expand.h b/modules/audio_coding/neteq4/preemptive_expand.h index 983f64d5..4d20ae63 100644 --- a/modules/audio_coding/neteq4/preemptive_expand.h +++ b/modules/audio_coding/neteq4/preemptive_expand.h @@ -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 { diff --git a/modules/audio_coding/neteq4/random_vector.h b/modules/audio_coding/neteq4/random_vector.h index 64cfe0d9..2c67ebbf 100644 --- a/modules/audio_coding/neteq4/random_vector.h +++ b/modules/audio_coding/neteq4/random_vector.h @@ -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 { diff --git a/modules/audio_coding/neteq4/rtcp.h b/modules/audio_coding/neteq4/rtcp.h index 00cbbd15..d4656678 100644 --- a/modules/audio_coding/neteq4/rtcp.h +++ b/modules/audio_coding/neteq4/rtcp.h @@ -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 { diff --git a/modules/audio_coding/neteq4/statistics_calculator.h b/modules/audio_coding/neteq4/statistics_calculator.h index 25f8a14b..30f9377a 100644 --- a/modules/audio_coding/neteq4/statistics_calculator.h +++ b/modules/audio_coding/neteq4/statistics_calculator.h @@ -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 { diff --git a/modules/audio_coding/neteq4/sync_buffer.h b/modules/audio_coding/neteq4/sync_buffer.h index 0659f199..8deb9500 100644 --- a/modules/audio_coding/neteq4/sync_buffer.h +++ b/modules/audio_coding/neteq4/sync_buffer.h @@ -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 { diff --git a/modules/audio_coding/neteq4/time_stretch.h b/modules/audio_coding/neteq4/time_stretch.h index f0f58b83..cd110b12 100644 --- a/modules/audio_coding/neteq4/time_stretch.h +++ b/modules/audio_coding/neteq4/time_stretch.h @@ -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 { diff --git a/modules/audio_coding/neteq4/timestamp_scaler.h b/modules/audio_coding/neteq4/timestamp_scaler.h index e165076a..604b5999 100644 --- a/modules/audio_coding/neteq4/timestamp_scaler.h +++ b/modules/audio_coding/neteq4/timestamp_scaler.h @@ -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 { diff --git a/modules/audio_coding/neteq4/tools/audio_loop.h b/modules/audio_coding/neteq4/tools/audio_loop.h index 0499a75c..144898eb 100644 --- a/modules/audio_coding/neteq4/tools/audio_loop.h +++ b/modules/audio_coding/neteq4/tools/audio_loop.h @@ -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" diff --git a/modules/audio_coding/neteq4/tools/input_audio_file.h b/modules/audio_coding/neteq4/tools/input_audio_file.h index de51ff88..7325d046 100644 --- a/modules/audio_coding/neteq4/tools/input_audio_file.h +++ b/modules/audio_coding/neteq4/tools/input_audio_file.h @@ -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 { diff --git a/modules/audio_coding/neteq4/tools/packet.h b/modules/audio_coding/neteq4/tools/packet.h index af549ffe..03586bc0 100644 --- a/modules/audio_coding/neteq4/tools/packet.h +++ b/modules/audio_coding/neteq4/tools/packet.h @@ -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" diff --git a/modules/audio_coding/neteq4/tools/packet_source.h b/modules/audio_coding/neteq4/tools/packet_source.h index 1e1997f5..261ae788 100644 --- a/modules/audio_coding/neteq4/tools/packet_source.h +++ b/modules/audio_coding/neteq4/tools/packet_source.h @@ -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 { diff --git a/modules/audio_coding/neteq4/tools/rtp_file_source.h b/modules/audio_coding/neteq4/tools/rtp_file_source.h index 6a0be2a2..86197d91 100644 --- a/modules/audio_coding/neteq4/tools/rtp_file_source.h +++ b/modules/audio_coding/neteq4/tools/rtp_file_source.h @@ -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 { diff --git a/modules/audio_coding/neteq4/tools/rtp_generator.h b/modules/audio_coding/neteq4/tools/rtp_generator.h index ece7ef29..e1fe8027 100644 --- a/modules/audio_coding/neteq4/tools/rtp_generator.h +++ b/modules/audio_coding/neteq4/tools/rtp_generator.h @@ -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 { diff --git a/modules/audio_device/linux/latebindingsymboltable_linux.h b/modules/audio_device/linux/latebindingsymboltable_linux.h index b5186fa7..052390a6 100644 --- a/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -32,7 +32,7 @@ #include <stddef.h> // for NULL #include <string.h> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/trace.h" // This file provides macros for creating "symbol table" classes to simplify the diff --git a/modules/desktop_capture/desktop_capture_options.h b/modules/desktop_capture/desktop_capture_options.h index c01d3d29..c6aabd45 100644 --- a/modules/desktop_capture/desktop_capture_options.h +++ b/modules/desktop_capture/desktop_capture_options.h @@ -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) diff --git a/modules/desktop_capture/desktop_geometry.h b/modules/desktop_capture/desktop_geometry.h index b469d3b2..047eeec3 100644 --- a/modules/desktop_capture/desktop_geometry.h +++ b/modules/desktop_capture/desktop_geometry.h @@ -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 { diff --git a/modules/desktop_capture/desktop_region.h b/modules/desktop_capture/desktop_region.h index fc7c6ed9..c4528ae3 100644 --- a/modules/desktop_capture/desktop_region.h +++ b/modules/desktop_capture/desktop_region.h @@ -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 { diff --git a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h index 73d425ae..4d1dd1ff 100644 --- a/modules/desktop_capture/mac/scoped_pixel_buffer_object.h +++ b/modules/desktop_capture/mac/scoped_pixel_buffer_object.h @@ -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 { diff --git a/modules/desktop_capture/mouse_cursor.h b/modules/desktop_capture/mouse_cursor.h index 3acfa45a..22887f9a 100644 --- a/modules/desktop_capture/mouse_cursor.h +++ b/modules/desktop_capture/mouse_cursor.h @@ -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 { diff --git a/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h index bb43b28b..7870d833 100644 --- a/modules/desktop_capture/shared_memory.h +++ b/modules/desktop_capture/shared_memory.h @@ -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 { diff --git a/modules/desktop_capture/win/desktop.h b/modules/desktop_capture/win/desktop.h index bdc490c7..fda56ca8 100644 --- a/modules/desktop_capture/win/desktop.h +++ b/modules/desktop_capture/win/desktop.h @@ -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 { diff --git a/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h index 0ca35c52..366df6d4 100644 --- a/modules/desktop_capture/win/scoped_gdi_object.h +++ b/modules/desktop_capture/win/scoped_gdi_object.h @@ -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 { diff --git a/modules/desktop_capture/win/scoped_thread_desktop.h b/modules/desktop_capture/win/scoped_thread_desktop.h index 39514237..f12731d9 100644 --- a/modules/desktop_capture/win/scoped_thread_desktop.h +++ b/modules/desktop_capture/win/scoped_thread_desktop.h @@ -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 { diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/modules/desktop_capture/win/screen_capturer_win_magnifier.h index 618386a9..b6d55908 100644 --- a/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -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 { diff --git a/modules/desktop_capture/window_capturer.h b/modules/desktop_capture/window_capturer.h index 86b3d19b..ad75c88d 100644 --- a/modules/desktop_capture/window_capturer.h +++ b/modules/desktop_capture/window_capturer.h @@ -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 { diff --git a/modules/desktop_capture/x11/x_error_trap.h b/modules/desktop_capture/x11/x_error_trap.h index fd834692..aa771145 100644 --- a/modules/desktop_capture/x11/x_error_trap.h +++ b/modules/desktop_capture/x11/x_error_trap.h @@ -13,7 +13,7 @@ #include <X11/Xlib.h> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" namespace webrtc { diff --git a/modules/interface/module_common_types.h b/modules/interface/module_common_types.h index f9ba592e..14139adf 100644 --- a/modules/interface/module_common_types.h +++ b/modules/interface/module_common_types.h @@ -16,8 +16,8 @@ #include <algorithm> +#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/typedefs.h" #ifdef _WIN32 diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc index 795089de..f67c7f34 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc @@ -10,8 +10,8 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index 5071deb7..14cfc31c 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -16,9 +16,9 @@ #include <utility> #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h index ef351797..49590653 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/modules/remote_bitrate_estimator/test/bwe_test.h @@ -12,9 +12,9 @@ #include <string> #include <vector> #include "gtest/gtest.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" namespace webrtc { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc index 3ba46e4a..48384fee 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc @@ -15,9 +15,9 @@ #include <algorithm> #include <vector> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h index dddbdeeb..e73a545e 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h @@ -15,8 +15,8 @@ #include <string> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" namespace webrtc { namespace testing { diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index 4ff35df4..ec329268 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -13,7 +13,7 @@ #include <numeric> #include "gtest/gtest.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/test/testsupport/fileutils.h" using std::vector; diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h index c9497635..340c992f 100644 --- a/modules/remote_bitrate_estimator/test/bwe_test_logging.h +++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.h @@ -98,8 +98,8 @@ #include <stack> #include <string> +#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" #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \ diff --git a/modules/rtp_rtcp/source/rtcp_receiver_help.h b/modules/rtp_rtcp/source/rtcp_receiver_help.h index 949beb9c..0ca43fa5 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_help.h +++ b/modules/rtp_rtcp/source/rtcp_receiver_help.h @@ -12,10 +12,10 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" // RTCPReportBlock #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index 650c0fad..e4d3dc08 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -28,8 +28,8 @@ #include <queue> #include <vector> +#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 { diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h index 13eb0e10..e146492c 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h @@ -18,9 +18,9 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_TEST_HELPER_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/vp8_partition_aggregator.h b/modules/rtp_rtcp/source/vp8_partition_aggregator.h index 2ca5f287..cbb1207b 100644 --- a/modules/rtp_rtcp/source/vp8_partition_aggregator.h +++ b/modules/rtp_rtcp/source/vp8_partition_aggregator.h @@ -13,8 +13,8 @@ #include <vector> +#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 { diff --git a/modules/video_coding/main/source/jitter_buffer.h b/modules/video_coding/main/source/jitter_buffer.h index 1e0a44a3..6ed9cfb8 100644 --- a/modules/video_coding/main/source/jitter_buffer.h +++ b/modules/video_coding/main/source/jitter_buffer.h @@ -16,6 +16,7 @@ #include <set> #include <vector> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" @@ -23,7 +24,6 @@ #include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/typedefs.h" diff --git a/modules/video_coding/main/test/test_util.h b/modules/video_coding/main/test/test_util.h index 36ca2198..9f8b5a95 100644 --- a/modules/video_coding/main/test/test_util.h +++ b/modules/video_coding/main/test/test_util.h @@ -17,9 +17,9 @@ #include <string> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" enum { kMaxNackListSize = 250 }; diff --git a/modules/video_coding/main/test/vcm_payload_sink_factory.h b/modules/video_coding/main/test/vcm_payload_sink_factory.h index 26dc8895..130bd428 100644 --- a/modules/video_coding/main/test/vcm_payload_sink_factory.h +++ b/modules/video_coding/main/test/vcm_payload_sink_factory.h @@ -11,9 +11,9 @@ #include <string> #include <vector> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/modules/video_coding/main/test/rtp_player.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" class NullEventFactory; diff --git a/system_wrappers/interface/atomic32.h b/system_wrappers/interface/atomic32.h index 08ab4f25..8633e263 100644 --- a/system_wrappers/interface/atomic32.h +++ b/system_wrappers/interface/atomic32.h @@ -17,8 +17,8 @@ #include <stddef.h> +#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" namespace webrtc { diff --git a/system_wrappers/interface/constructor_magic.h b/system_wrappers/interface/constructor_magic.h deleted file mode 100644 index b2aabc57..00000000 --- a/system_wrappers/interface/constructor_magic.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -/* - * WebRtc - * Copy from third_party/libjingle/source/talk/base/constructormagic.h - */ - -#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CONSTRUCTOR_MAGIC_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CONSTRUCTOR_MAGIC_H_ - -#ifndef DISALLOW_ASSIGN -#define DISALLOW_ASSIGN(TypeName) \ - void operator=(const TypeName&) -#endif - -#ifndef DISALLOW_COPY_AND_ASSIGN -// A macro to disallow the evil copy constructor and operator= functions -// This should be used in the private: declarations for a class -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ - DISALLOW_ASSIGN(TypeName) -#endif - -#ifndef DISALLOW_EVIL_CONSTRUCTORS -// Alternative, less-accurate legacy name. -#define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \ - DISALLOW_COPY_AND_ASSIGN(TypeName) -#endif - -#ifndef DISALLOW_IMPLICIT_CONSTRUCTORS -// A macro to disallow all the implicit constructors, namely the -// default constructor, copy constructor and operator= functions. -// -// This should be used in the private: declarations for a class -// that wants to prevent anyone from instantiating it. This is -// especially useful for classes containing only static methods. -#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ - DISALLOW_EVIL_CONSTRUCTORS(TypeName) -#endif - -#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CONSTRUCTOR_MAGIC_H_ diff --git a/system_wrappers/interface/scoped_ptr.h b/system_wrappers/interface/scoped_ptr.h index 8998f817..42bb8a6d 100644 --- a/system_wrappers/interface/scoped_ptr.h +++ b/system_wrappers/interface/scoped_ptr.h @@ -104,8 +104,8 @@ #include <algorithm> // For std::swap(). +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/compile_assert.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/template_util.h" #include "webrtc/system_wrappers/source/move.h" #include "webrtc/typedefs.h" diff --git a/test/fake_network_pipe.h b/test/fake_network_pipe.h index 3dcda298..b9690e79 100644 --- a/test/fake_network_pipe.h +++ b/test/fake_network_pipe.h @@ -13,7 +13,7 @@ #include <queue> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h index 7701840c..7950b0f9 100644 --- a/test/mac/video_renderer_mac.h +++ b/test/mac/video_renderer_mac.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_ #define WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/test/gl/gl_renderer.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" @class CocoaWindow; diff --git a/test/test_suite.h b/test/test_suite.h index 16c03579..e28fb233 100644 --- a/test/test_suite.h +++ b/test/test_suite.h @@ -17,7 +17,7 @@ // instantiate this class in your main function and call its Run method to run // any gtest based tests that are linked into your executable. -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/tools/simple_command_line_parser.h b/tools/simple_command_line_parser.h index 348e8c3d..6bb33137 100644 --- a/tools/simple_command_line_parser.h +++ b/tools/simple_command_line_parser.h @@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "webrtc/system_wrappers/interface/constructor_magic.h" +#include "webrtc/base/constructormagic.h" #include "webrtc/test/testsupport/gtest_prod_util.h" // This is a very basic command line parsing class. We pass the command line diff --git a/video_engine/call_stats.h b/video_engine/call_stats.h index 5c021a48..5eb33358 100644 --- a/video_engine/call_stats.h +++ b/video_engine/call_stats.h @@ -13,8 +13,8 @@ #include <list> +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" namespace webrtc { diff --git a/video_engine/encoder_state_feedback.h b/video_engine/encoder_state_feedback.h index 4e0cdc35..a58532ce 100644 --- a/video_engine/encoder_state_feedback.h +++ b/video_engine/encoder_state_feedback.h @@ -16,7 +16,7 @@ #include <map> -#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" diff --git a/video_engine/overuse_frame_detector.h b/video_engine/overuse_frame_detector.h index 92a2d14a..c30bb57d 100644 --- a/video_engine/overuse_frame_detector.h +++ b/video_engine/overuse_frame_detector.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_ #define WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_ +#include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/video_engine/include/vie_base.h" diff --git a/video_engine/test/libvietest/include/tb_interfaces.h b/video_engine/test/libvietest/include/tb_interfaces.h index b79012dc..5b52a1e2 100644 --- a/video_engine/test/libvietest/include/tb_interfaces.h +++ b/video_engine/test/libvietest/include/tb_interfaces.h @@ -13,8 +13,8 @@ #include <string> +#include "webrtc/base/constructormagic.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_codec.h" diff --git a/video_engine/test/libvietest/include/vie_to_file_renderer.h b/video_engine/test/libvietest/include/vie_to_file_renderer.h index c3694a09..e23dad2a 100644 --- a/video_engine/test/libvietest/include/vie_to_file_renderer.h +++ b/video_engine/test/libvietest/include/vie_to_file_renderer.h @@ -17,7 +17,7 @@ #include <list> #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/video_engine/include/vie_render.h" diff --git a/voice_engine/channel_manager.h b/voice_engine/channel_manager.h index 1da976dc..3c0f6814 100644 --- a/voice_engine/channel_manager.h +++ b/voice_engine/channel_manager.h @@ -13,8 +13,8 @@ #include <vector> +#include "webrtc/base/constructormagic.h" #include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/typedefs.h" |