Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Issue 1330283002: Revert of Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed)

Created:
5 years, 3 months ago by tommi
Modified:
5 years, 3 months ago
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Consolidate constructormagic macros with Chromium version and remove Chromium override. (patchset #4 id:60001 of https://codereview.webrtc.org/1316363005/ ) Reason for revert: Had to revert since FYI bots stopped compiling. Example failure: [94/9470] CXX obj\third_party\webrtc\modules\video_processing\main\source\video_processing_sse2.content_analysis_sse2.obj FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj.rsp /c ..\..\third_party\webrtc\modules\video_coding\codecs\h264\h264.cc /Foobj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj /Fdobj\third_party\webrtc\modules\webrtc_h264.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj.rsp /c ..\..\third_party\webrtc\base\bitbuffer.cc /Foobj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj /Fdobj\third_party\webrtc\base\rtc_base_approved.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj.rsp /c ..\..\third_party\webrtc\modules\audio_processing\logging\aec_logging_file_handling.cc /Foobj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj /Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj.rsp /c ..\..\third_party\webrtc\modules\audio_processing\beamformer\nonlinear_beamformer.cc /Foobj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj /Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' Original issue's description: > Consolidate constructormagic macros with Chromium version and remove Chromium override. > > Part of work removing dependency on Chromium's base. > > Only adds "= delete". From https://codereview.chromium.org/1151443003 : > "This will guarantee the error to be at compile time, and not rely on the call visibility (private)." > > In consequence of that change, fixed an illegal copy and removed a bunch of unused variables. > > BUG=chromium:468375 (in particular comment #37) > NOTRY=true > > Committed: https://crrev.com/0de8ff488d92e0bc6b7b65662898ff5e955cda93 > Cr-Commit-Position: refs/heads/master@{#9913} TBR=andrew@webrtc.org,henrikg@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:468375 (in particular comment #37) Committed: https://crrev.com/9a78d22822880884f9fa495e4cbe33f5224296c4 Cr-Commit-Position: refs/heads/master@{#9914}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+48 lines, -15 lines) Patch
M talk/app/webrtc/videosource.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M webrtc/base/constructormagic.h View 1 chunk +12 lines, -12 lines 0 comments Download
M webrtc/base/logging.cc View 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/base/natserver.h View 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/base/virtualsocketserver.h View 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/base/virtualsocketserver.cc View 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h View 2 chunks +3 lines, -0 lines 0 comments Download
M webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc View 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/modules/rtp_rtcp/source/rtp_format_h264.h View 1 chunk +1 line, -0 lines 0 comments Download
M webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc View 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/modules/video_coding/main/test/test_util.h View 1 chunk +1 line, -0 lines 0 comments Download
A webrtc/overrides/webrtc/base/constructormagic.h View 1 chunk +20 lines, -0 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
tommi
Created Revert of Consolidate constructormagic macros with Chromium version and remove Chromium override.
5 years, 3 months ago (2015-09-10 08:41:39 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1330283002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1330283002/1
5 years, 3 months ago (2015-09-10 08:41:46 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 3 months ago (2015-09-10 08:42:00 UTC) #3
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/9a78d22822880884f9fa495e4cbe33f5224296c4 Cr-Commit-Position: refs/heads/master@{#9914}
5 years, 3 months ago (2015-09-10 08:42:09 UTC) #4
tommi
On 2015/09/10 08:41:39, tommi (webrtc) wrote: > Created Revert of Consolidate constructormagic macros with Chromium ...
5 years, 3 months ago (2015-09-10 08:42:09 UTC) #5
Henrik Grunell WebRTC
5 years, 3 months ago (2015-09-10 09:14:41 UTC) #6
Message was sent while issue was closed.
lgtm

Powered by Google App Engine
This is Rietveld 408576698