| Index: base/lazy_instance.h
|
| diff --git a/base/lazy_instance.h b/base/lazy_instance.h
|
| index 3935780a55b7352ba78611944b48fa3cfce15d14..05a7c5d81eccb0291706ae8e29c32aac8a9acd65 100644
|
| --- a/base/lazy_instance.h
|
| +++ b/base/lazy_instance.h
|
| @@ -57,7 +57,9 @@ namespace base {
|
| template <typename Type>
|
| struct DefaultLazyInstanceTraits {
|
| static const bool kRegisterOnExit = true;
|
| +#ifndef NDEBUG
|
| static const bool kAllowedToAccessOnNonjoinableThread = false;
|
| +#endif
|
|
|
| static Type* New(void* instance) {
|
| DCHECK_EQ(reinterpret_cast<uintptr_t>(instance) & (ALIGNOF(Type) - 1), 0u)
|
| @@ -89,7 +91,9 @@ namespace internal {
|
| template <typename Type>
|
| struct LeakyLazyInstanceTraits {
|
| static const bool kRegisterOnExit = false;
|
| +#ifndef NDEBUG
|
| static const bool kAllowedToAccessOnNonjoinableThread = true;
|
| +#endif
|
|
|
| static Type* New(void* instance) {
|
| ANNOTATE_SCOPED_MEMORY_LEAK;
|
|
|