Fix style violations in common_types.h and config.h
Mostly, it's about moving constructors and descructors to the .cc
files, so that they won't be inlined everywhere.
The reason this CL is so big is that a lot of code was using
common_types.h without declaring a dependency on webrtc_common, which
broke the build once common_types.h started to depend on
common_types.cc.
BUG=163
R=kjellander@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/26089004
Cr-Commit-Position: refs/heads/master@{#8516}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8516 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index a90f5be..6e280da 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -72,6 +72,7 @@
":neteq",
":pcm16b",
":red",
+ "../..:webrtc_common",
"../../common_audio",
"../../system_wrappers",
]
@@ -89,6 +90,7 @@
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
+ deps = [ "../..:webrtc_common" ]
}
source_set("audio_encoder_interface") {
@@ -98,6 +100,7 @@
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
+ deps = [ "../..:webrtc_common" ]
}
config("cng_config") {
@@ -439,12 +442,6 @@
"codecs/isac/main/source/transform.c",
]
- if (is_clang) {
- # Suppress warnings from Chrome's Clang plugins.
- # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
- configs -= [ "//build/config/clang:find_bad_constructs" ]
- }
-
if (is_linux) {
libs = [ "m" ]
}
@@ -518,12 +515,6 @@
"codecs/isac/fix/source/transform_tables.c",
]
- if (is_clang) {
- # Suppress warnings from Chrome's Clang plugins.
- # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
- configs -= [ "//build/config/clang:find_bad_constructs" ]
- }
-
if (!is_win) {
defines = [ "WEBRTC_LINUX" ]
}
@@ -786,6 +777,7 @@
":isac",
":isacfix",
":pcm16b",
+ "../..:webrtc_common",
"../../common_audio",
"../../system_wrappers",
rtc_opus_dir,
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
index 44b6bb7..edbcaa9 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi
@@ -17,6 +17,7 @@
'iSACFix',
'PCM16B',
'red',
+ '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
@@ -37,6 +38,7 @@
],
'dependencies': [
'<@(audio_coding_dependencies)',
+ '<(webrtc_root)/common.gyp:webrtc_common',
'neteq',
],
'include_dirs': [
@@ -122,6 +124,7 @@
'dependencies': [
'audio_coding_module',
'<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
@@ -140,6 +143,7 @@
'dependencies': [
'audio_coding_module',
'<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index a301c37..ccf30ee 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -38,6 +38,7 @@
'type': 'static_library',
'dependencies': [
'<@(neteq_dependencies)',
+ '<(webrtc_root)/common.gyp:webrtc_common',
],
'defines': [
'<@(neteq_defines)',
diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index ed9c84a..e053eb4 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -234,6 +234,7 @@
'iLBC',
'iSAC',
'CNG',
+ '<(webrtc_root)/common.gyp:webrtc_common',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'direct_dependent_settings': {