| commit | 63c7ad499be49ef959b3b1c5ea3f48491aa033d3 | [log] [tgz] |
|---|---|---|
| author | Andrew Top <aabtop@google.com> | Mon Nov 25 16:10:13 2019 -0800 |
| committer | Andrew Top <aabtop@google.com> | Tue Nov 26 17:03:47 2019 -0800 |
| tree | d79834891b0a2cceff2017e52c5664437df3a603 | |
| parent | cab7770533804d582eaa66c713a1582f361182d3 [diff] [blame] |
Import Cobalt 20.master.0.234144 Includes the following patches: https://cobalt-review.googlesource.com/c/cobalt/+/5590 by n1214.hwang@samsung.com https://cobalt-review.googlesource.com/c/cobalt/+/5530 by errong.leng@samsung.com https://cobalt-review.googlesource.com/c/cobalt/+/5570 by devin.cai@mediatek.com
diff --git a/src/base/trace_event/memory_usage_estimator.h b/src/base/trace_event/memory_usage_estimator.h index 53ce8f7..24f144f 100644 --- a/src/base/trace_event/memory_usage_estimator.h +++ b/src/base/trace_event/memory_usage_estimator.h
@@ -211,10 +211,12 @@ struct EMUCaller { // std::is_same<> below makes static_assert depend on T, in order to // prevent it from asserting regardless instantiation. +#if !defined(_GLIBCXX_DEBUG) && !defined(_LIBCPP_DEBUG) static_assert(std::is_same<T, std::false_type>::value, "Neither global function 'size_t EstimateMemoryUsage(T)' " "nor member function 'size_t T::EstimateMemoryUsage() const' " "is defined for the type."); +#endif static size_t Call(const T&) { return 0; } };