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
..
2015-09-08 07:57:41 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-09-04 11:21:14 +00:00
2015-09-04 11:21:14 +00:00
2015-03-09 22:24:25 +00:00
2015-08-20 14:42:50 +00:00
2015-08-20 14:42:50 +00:00
2015-03-09 22:24:25 +00:00
2015-04-04 23:56:56 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-08-03 17:23:40 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-04-30 12:16:14 +00:00
2015-07-22 15:35:04 +00:00
2014-10-09 22:08:15 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-09-04 11:21:14 +00:00
2015-09-05 11:39:24 +00:00
2014-05-13 18:00:26 +00:00
2015-06-16 14:13:40 +00:00
2015-06-16 14:13:40 +00:00
2015-08-25 15:56:37 +00:00
2015-08-25 15:56:37 +00:00
2015-08-25 15:56:37 +00:00
2015-07-14 19:55:56 +00:00
2015-05-12 19:20:44 +00:00
2015-05-12 19:20:44 +00:00
2015-05-04 12:54:56 +00:00
2015-04-20 12:03:00 +00:00
2015-05-04 12:54:56 +00:00
2015-05-21 15:51:41 +00:00
2015-05-21 15:51:41 +00:00
2015-05-21 15:51:41 +00:00
2015-09-09 20:22:40 +00:00
2014-05-13 18:00:26 +00:00
2015-04-20 12:03:00 +00:00
2015-04-20 12:03:00 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-04-02 10:31:00 +00:00
2014-05-13 18:00:26 +00:00
2014-09-10 03:24:36 +00:00
2015-03-04 11:26:19 +00:00
2014-06-23 16:15:27 +00:00
2015-03-04 13:04:54 +00:00
2015-09-10 08:42:03 +00:00
2014-10-09 22:08:15 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-04-23 09:37:37 +00:00
2015-05-27 21:41:52 +00:00
2015-05-27 21:41:52 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-02-17 21:23:13 +00:00
2014-05-13 18:00:26 +00:00
2015-02-12 11:55:32 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-17 14:26:15 +00:00
2015-03-17 14:26:15 +00:00
2015-03-17 14:26:15 +00:00
2014-05-13 18:00:26 +00:00
2015-02-10 12:28:12 +00:00
2015-02-10 12:28:12 +00:00
2014-07-16 21:28:26 +00:00
2014-07-16 21:28:26 +00:00
2014-07-16 21:28:26 +00:00
2015-08-19 17:32:51 +00:00
2015-04-20 12:03:00 +00:00
2014-05-13 18:00:26 +00:00
2015-07-23 19:27:06 +00:00
2015-07-23 19:27:06 +00:00
2015-07-23 19:27:06 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-06-10 18:33:24 +00:00
2015-03-09 22:24:25 +00:00
2014-08-28 16:28:26 +00:00
2015-04-04 23:56:56 +00:00
2014-11-20 22:28:14 +00:00
2014-05-13 18:00:26 +00:00
2014-09-04 09:55:40 +00:00
2014-09-28 11:36:45 +00:00
2015-09-05 11:39:24 +00:00
2014-05-13 18:00:26 +00:00
2015-05-23 07:54:19 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-02-12 11:55:32 +00:00
2015-05-25 09:26:08 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-05-26 18:53:39 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-05-16 16:54:44 +00:00
2015-03-09 22:24:25 +00:00
2014-08-27 10:17:22 +00:00
2014-05-14 18:24:13 +00:00
2014-05-13 18:00:26 +00:00
2015-08-15 16:28:46 +00:00
2015-08-20 15:48:27 +00:00
2015-08-20 15:48:27 +00:00
2015-04-02 09:59:23 +00:00
2015-04-02 09:59:23 +00:00
2015-04-02 09:59:23 +00:00
2014-05-13 18:00:26 +00:00
2014-08-21 14:49:28 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-05-25 09:26:08 +00:00
2015-05-25 09:26:08 +00:00
2015-05-25 09:26:08 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-05-25 09:26:08 +00:00
2015-09-10 08:42:03 +00:00
2015-09-07 07:35:03 +00:00
2015-07-23 19:27:06 +00:00
2015-07-23 19:27:06 +00:00
2014-05-13 18:00:26 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-09-03 22:53:34 +00:00
2015-05-21 11:50:41 +00:00
2015-05-21 11:50:41 +00:00
2015-06-15 14:03:58 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-05-14 18:24:13 +00:00
2015-04-01 22:25:29 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-04-01 22:25:29 +00:00
2014-05-13 18:00:26 +00:00
2015-02-11 14:31:19 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-07-13 09:16:47 +00:00
2015-02-21 02:00:26 +00:00
2015-04-27 15:39:00 +00:00
2015-03-09 22:24:25 +00:00
2015-05-25 09:26:08 +00:00
2015-02-12 11:55:32 +00:00
2015-03-09 22:24:25 +00:00
2015-07-22 13:28:33 +00:00
2015-07-16 17:22:28 +00:00
2015-09-10 08:42:03 +00:00
2015-07-16 17:22:28 +00:00
2015-07-16 17:22:28 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-08-21 16:06:37 +00:00
2015-08-21 16:06:37 +00:00
2015-08-21 16:06:37 +00:00
2015-09-05 11:39:24 +00:00
2015-09-05 11:39:24 +00:00
2015-09-05 11:39:24 +00:00
2015-09-05 11:39:24 +00:00
2015-02-09 14:19:39 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-06-06 11:09:38 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-08-17 12:09:10 +00:00
2015-08-17 12:09:10 +00:00
2015-09-05 11:39:24 +00:00
2015-08-17 12:09:10 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-04-01 15:08:49 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-08-19 11:42:07 +00:00
2015-05-23 00:50:33 +00:00
2015-03-09 22:24:25 +00:00
2014-10-10 08:36:56 +00:00
2014-10-10 08:36:56 +00:00
2015-05-18 11:50:31 +00:00
2015-05-18 11:50:31 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-06-17 14:37:05 +00:00
2015-05-23 00:50:33 +00:00
2015-03-09 22:24:25 +00:00
2014-10-09 22:08:15 +00:00
2014-05-13 18:00:26 +00:00
2015-05-21 11:50:41 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-07-16 17:22:28 +00:00
2015-07-16 17:22:28 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-17 12:45:41 +00:00
2015-03-17 12:45:41 +00:00
2014-05-13 18:00:26 +00:00
2015-07-22 15:35:04 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-02-12 11:55:32 +00:00
2015-08-20 10:16:04 +00:00
2015-08-20 10:16:04 +00:00
2015-01-14 10:51:54 +00:00
2014-12-17 22:56:09 +00:00
2015-02-12 11:55:32 +00:00
2015-01-07 18:01:07 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2015-04-22 17:43:59 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-05-20 18:25:21 +00:00
2014-05-14 18:24:13 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-10-09 22:08:15 +00:00
2015-02-09 14:19:39 +00:00
2014-09-24 07:10:57 +00:00
2015-04-04 23:56:56 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2014-05-13 18:00:26 +00:00
2014-06-05 20:40:11 +00:00
2014-06-05 20:40:11 +00:00
2014-06-05 20:40:11 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-04-04 23:56:56 +00:00
2015-07-16 17:22:28 +00:00
2015-04-04 23:56:56 +00:00
2014-07-10 22:47:02 +00:00
2014-09-10 22:10:24 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-02-09 14:19:39 +00:00
2014-05-13 18:00:26 +00:00
2015-04-04 23:56:56 +00:00
2015-08-17 12:09:10 +00:00
2015-09-05 11:39:24 +00:00
2014-12-29 23:00:14 +00:00
2015-09-05 11:39:24 +00:00
2015-04-20 12:03:00 +00:00
2015-04-20 12:03:00 +00:00
2015-09-05 11:39:24 +00:00
2015-09-05 11:39:24 +00:00
2015-09-01 18:31:34 +00:00
2014-05-14 18:24:13 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-09-05 11:39:24 +00:00
2015-09-05 11:39:24 +00:00
2015-08-17 12:09:10 +00:00
2015-05-20 10:48:24 +00:00
2015-09-05 11:39:24 +00:00
2015-07-23 19:27:06 +00:00
2015-07-23 19:27:06 +00:00
2015-07-23 19:27:06 +00:00
2015-05-15 16:21:16 +00:00
2015-05-15 20:14:13 +00:00
2015-05-15 20:14:13 +00:00
2014-05-13 18:00:26 +00:00
2014-09-16 01:03:29 +00:00
2015-07-09 23:45:55 +00:00
2015-08-20 12:04:18 +00:00
2015-09-01 18:36:50 +00:00
2015-08-20 12:04:18 +00:00
2015-04-04 23:56:56 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2015-01-13 20:32:04 +00:00
2014-05-13 18:00:26 +00:00
2015-08-19 11:42:07 +00:00
2015-02-07 22:38:16 +00:00
2015-04-04 23:56:56 +00:00
2015-04-04 23:56:56 +00:00
2015-02-12 11:55:32 +00:00
2014-09-24 06:05:00 +00:00
2015-05-18 07:51:16 +00:00
2015-05-18 07:51:16 +00:00
2015-03-04 13:04:54 +00:00
2014-06-16 11:34:44 +00:00
2015-08-20 14:42:50 +00:00
2015-05-23 00:50:33 +00:00
2015-03-17 14:26:15 +00:00
2014-05-21 20:42:17 +00:00
2014-09-16 01:03:29 +00:00
2014-05-21 20:42:17 +00:00
2014-07-08 12:48:29 +00:00
2014-07-08 12:48:29 +00:00
2015-03-17 14:26:15 +00:00
2015-03-09 22:24:25 +00:00
2015-03-09 22:24:25 +00:00
2015-05-23 07:54:19 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2014-05-14 18:24:13 +00:00
2014-09-10 22:10:24 +00:00
2014-05-14 18:24:13 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-08-14 05:24:12 +00:00
2015-09-10 08:42:03 +00:00
2015-09-10 08:42:03 +00:00
2015-02-17 19:01:14 +00:00
2015-05-18 11:50:31 +00:00
2015-07-02 00:52:18 +00:00
2015-01-22 17:44:19 +00:00
2015-01-22 17:44:19 +00:00
2015-01-14 09:03:16 +00:00
2014-05-13 18:00:26 +00:00
2015-04-04 23:56:56 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-02-12 11:55:32 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-09-16 01:03:29 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-08-18 20:55:58 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-07-09 07:54:02 +00:00
2014-05-13 18:00:26 +00:00
2014-05-13 18:00:26 +00:00
2015-03-09 22:24:25 +00:00
2014-08-15 14:44:13 +00:00
2015-02-12 11:55:32 +00:00
2015-03-09 22:24:25 +00:00