guidou
8f9010631c
Revert of Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere (patchset #2 id:20001 of https://codereview.webrtc.org/2384693002/ )
Reason for revert:
This CL breaks FYI bots with a compile error.
Sample error:
jingle/glue/thread_wrapper.cc -o obj/jingle/jingle_glue/thread_wrapper.o
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:46:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<rtc::Thread *, jingle_glue::JingleThreadWrapper *>' requested here
DCHECK_EQ(rtc::Thread::Current(), current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:102:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = rtc::Thread *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = rtc::Thread *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:81:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<jingle_glue::JingleThreadWrapper *, jingle_glue::JingleThreadWrapper *>' requested here
DCHECK_EQ(this, JingleThreadWrapper::current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:5:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:82:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<jingle_glue::JingleThreadWrapper *, rtc::Thread *>' requested here
DCHECK_EQ(this, rtc::Thread::Current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:12:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = rtc::Thread *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = rtc::Thread *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
3 errors generated.
Original issue's description:
> Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere
>
> The former is always defined (by webrtc/base/checks.h) to either 0 or
> 1, whereas the latter isn't necessarily defined.
>
> NOTRY=true
> BUG=webrtc:6451
>
> Committed: https://crrev.com/ab0b929321d37669165d5795268fa10a8c97ec5b
> Cr-Commit-Position: refs/heads/master@{#14474}
TBR=ossu@webrtc.org,kwiberg@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6451
Review-Url: https://codereview.webrtc.org/2384083004
Cr-Commit-Position: refs/heads/master@{#14480}
2016-10-03 15:32:36 +00:00
..
2016-10-03 15:07:06 +00:00
2016-09-29 11:12:51 +00:00
2016-09-20 08:47:19 +00:00
2016-09-16 06:33:04 +00:00
2016-09-29 00:42:08 +00:00
2016-09-22 08:26:06 +00:00
2016-09-22 08:26:06 +00:00
2016-07-01 12:10:59 +00:00
2016-09-16 06:33:04 +00:00
2016-03-23 07:34:01 +00:00
2016-05-15 02:44:18 +00:00
2016-09-28 07:47:59 +00:00
2016-08-12 17:10:42 +00:00
2016-08-24 20:15:35 +00:00
2016-08-12 17:10:42 +00:00
2016-03-20 13:15:48 +00:00
2016-06-13 14:35:01 +00:00
2016-05-06 18:29:27 +00:00
2016-06-10 21:17:33 +00:00
2016-04-29 13:09:23 +00:00
2016-02-10 15:54:53 +00:00
2016-03-01 20:42:08 +00:00
2016-02-10 15:54:53 +00:00
2016-02-10 15:54:53 +00:00
2016-03-14 18:59:34 +00:00
2016-03-14 18:59:34 +00:00
2016-03-14 18:59:34 +00:00
2016-04-27 13:47:40 +00:00
2016-04-27 13:47:40 +00:00
2016-05-15 02:44:18 +00:00
2016-03-04 10:51:44 +00:00
2016-06-30 07:02:41 +00:00
2016-05-15 02:44:18 +00:00
2016-04-12 06:25:34 +00:00
2016-06-30 07:02:41 +00:00
2016-06-30 07:02:41 +00:00
2016-06-10 21:17:33 +00:00
2016-03-01 20:42:08 +00:00
2016-10-01 05:29:53 +00:00
2016-02-10 15:54:53 +00:00
2016-04-29 13:09:23 +00:00
2016-09-06 09:25:11 +00:00
2016-02-10 15:54:53 +00:00
2016-02-10 15:54:53 +00:00
2016-04-15 10:49:13 +00:00
2016-03-24 10:16:23 +00:00
2016-04-15 10:49:13 +00:00
2016-02-10 15:54:53 +00:00
2016-09-09 12:51:48 +00:00
2016-09-16 22:07:58 +00:00
2016-09-16 06:33:04 +00:00
2016-09-16 06:33:04 +00:00
2016-08-05 18:14:54 +00:00
2016-07-11 11:10:14 +00:00
2016-08-31 05:07:56 +00:00
2016-08-31 05:07:56 +00:00
2016-07-04 14:07:03 +00:00
2016-10-01 05:29:53 +00:00
2016-09-16 06:33:04 +00:00
2016-09-16 06:33:04 +00:00
2016-10-01 05:29:53 +00:00
2016-06-10 21:17:33 +00:00
2016-07-13 21:13:56 +00:00
2016-07-13 21:13:56 +00:00
2016-07-13 21:13:56 +00:00
2016-08-05 18:14:54 +00:00
2016-08-05 18:14:54 +00:00
2016-08-05 18:14:54 +00:00
2016-06-27 23:30:45 +00:00
2016-08-31 14:33:14 +00:00
2016-09-16 06:33:04 +00:00
2016-09-16 06:33:04 +00:00
2016-09-16 06:33:04 +00:00
2016-06-22 07:46:19 +00:00
2016-06-27 23:30:45 +00:00
2016-06-27 23:30:45 +00:00
2016-06-27 23:30:45 +00:00
2016-06-27 23:30:45 +00:00
2016-06-27 23:30:45 +00:00
2016-06-06 21:27:43 +00:00
2016-10-01 05:29:53 +00:00
2016-02-10 15:54:53 +00:00
2016-03-30 13:43:44 +00:00
2016-03-20 13:15:48 +00:00
2016-10-01 05:29:53 +00:00
2016-10-03 15:32:36 +00:00
2016-08-25 10:52:46 +00:00
2016-10-03 15:32:36 +00:00
2016-09-20 08:47:19 +00:00
2016-02-10 15:54:53 +00:00
2016-08-26 18:25:09 +00:00
2016-10-03 06:45:33 +00:00
2016-09-14 19:03:21 +00:00
2016-09-06 09:25:11 +00:00
2016-09-06 09:25:11 +00:00
2016-04-27 13:47:40 +00:00
2016-04-07 14:46:00 +00:00
2016-04-29 13:09:23 +00:00
2016-04-07 14:46:00 +00:00
2016-09-06 09:25:11 +00:00
2016-09-28 17:04:41 +00:00
2016-09-28 17:04:41 +00:00
2016-03-14 18:59:34 +00:00
2016-08-24 22:15:07 +00:00
2016-08-31 14:33:14 +00:00
2016-08-26 18:25:09 +00:00
2016-06-10 21:17:33 +00:00
2016-07-11 11:10:14 +00:00