tommi
9a78d22822
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)
Review URL: https://codereview.webrtc.org/1330283002
Cr-Commit-Position: refs/heads/master@{#9914}
2015-09-10 08:42:03 +00:00
..
2014-07-08 12:10:51 +00:00
2015-09-08 20:25:20 +00:00
2014-11-20 22:28:14 +00:00
2015-02-26 14:43:50 +00:00
2015-01-28 12:38:16 +00:00
2015-09-04 08:07:01 +00:00
2015-02-12 12:20:50 +00:00
2013-05-08 10:04:06 +00:00
2013-05-29 14:27:38 +00:00
2013-05-29 14:27:38 +00:00
2015-06-30 08:32:47 +00:00
2015-03-04 13:04:54 +00:00
2015-07-06 10:09:15 +00:00
2015-03-17 16:44:54 +00:00
2015-02-23 21:29:45 +00:00
2013-08-05 16:22:53 +00:00
2013-12-24 05:06:12 +00:00
2015-07-06 10:09:15 +00:00
2015-07-06 10:09:15 +00:00
2015-04-29 00:55:43 +00:00
2015-07-14 17:45:07 +00:00
2015-04-24 11:56:44 +00:00
2015-04-21 12:25:42 +00:00
2014-04-14 20:08:03 +00:00
2015-07-11 01:10:08 +00:00
2015-07-11 01:10:08 +00:00
2015-07-11 01:10:08 +00:00
2015-04-14 19:28:03 +00:00
2015-04-14 19:28:03 +00:00
2015-04-14 19:28:03 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-01-12 21:51:21 +00:00
2015-01-12 21:51:21 +00:00
2015-07-06 08:51:01 +00:00
2015-07-29 08:47:04 +00:00
2015-07-29 08:47:04 +00:00
2015-07-29 08:47:04 +00:00
2013-10-02 13:15:34 +00:00
2015-02-26 14:43:50 +00:00
2015-07-06 08:51:01 +00:00
2015-07-24 07:58:29 +00:00
2015-07-24 07:58:29 +00:00
2015-09-01 08:11:36 +00:00
2015-09-08 20:25:20 +00:00
2015-09-08 20:25:20 +00:00
2014-10-29 12:42:30 +00:00
2015-05-11 08:17:46 +00:00
2015-05-11 08:17:46 +00:00
2015-03-17 16:44:54 +00:00
2015-07-01 10:00:20 +00:00
2015-09-10 08:42:03 +00:00
2015-09-10 08:42:03 +00:00
2015-06-30 12:09:47 +00:00
2015-03-04 13:04:54 +00:00
2014-11-20 22:28:14 +00:00
2014-11-20 22:28:14 +00:00
2015-06-30 09:12:09 +00:00
2015-07-30 12:44:34 +00:00
2015-03-04 13:04:54 +00:00
2015-09-08 09:40:36 +00:00
2015-09-08 09:40:36 +00:00
2015-07-28 11:02:58 +00:00
2015-07-28 11:02:58 +00:00
2014-11-07 11:02:12 +00:00
2015-04-01 22:33:15 +00:00
2015-04-01 22:33:15 +00:00
2015-04-01 22:33:15 +00:00
2015-03-04 13:04:54 +00:00
2015-02-02 13:08:14 +00:00
2015-02-02 13:08:14 +00:00
2015-02-26 14:43:50 +00:00
2015-03-25 15:11:34 +00:00
2015-07-31 13:10:16 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-07 15:32:56 +00:00
2015-07-01 12:35:56 +00:00
2015-03-09 11:54:45 +00:00
2014-12-15 22:09:40 +00:00
2015-06-08 07:54:24 +00:00
2015-09-08 20:25:20 +00:00
2015-09-08 20:25:20 +00:00
2015-03-17 16:44:54 +00:00
2015-02-26 14:43:50 +00:00
2015-08-10 13:08:46 +00:00
2015-07-31 13:10:16 +00:00
2015-04-14 19:28:03 +00:00
2015-08-03 11:38:48 +00:00
2015-08-03 11:38:48 +00:00
2015-08-10 13:08:46 +00:00
2015-03-17 16:44:54 +00:00
2014-07-22 06:48:58 +00:00
2014-07-22 06:48:58 +00:00
2014-07-11 19:09:59 +00:00
2013-07-10 15:40:42 +00:00
2013-07-03 15:12:26 +00:00
2014-11-20 22:28:14 +00:00
2014-11-20 22:28:14 +00:00
2014-11-20 22:28:14 +00:00