Require explicit selection of traits for LazyInstance

https://codereview.chromium.org/2733283002
This commit is contained in:
Aleksei Kuzmin 2017-06-20 22:14:39 +03:00
parent e16e1e2854
commit e2fe95894f
4 changed files with 7 additions and 7 deletions

View file

@ -16,8 +16,8 @@ namespace atom {
namespace { namespace {
using GuestViewContainerMap = std::map<int, GuestViewContainer*>; using GuestViewContainerMap = std::map<int, GuestViewContainer*>;
static base::LazyInstance<GuestViewContainerMap> g_guest_view_container_map = static base::LazyInstance<GuestViewContainerMap>::DestructorAtExit
LAZY_INSTANCE_INITIALIZER; g_guest_view_container_map = LAZY_INSTANCE_INITIALIZER;
} // namespace } // namespace

View file

@ -17,8 +17,8 @@ namespace atom {
namespace { namespace {
static base::LazyInstance<base::ThreadLocalPointer<WebWorkerObserver>> static base::LazyInstance<base::ThreadLocalPointer<WebWorkerObserver>>::
lazy_tls = LAZY_INSTANCE_INITIALIZER; DestructorAtExit lazy_tls = LAZY_INSTANCE_INITIALIZER;
} // namespace } // namespace

View file

@ -68,7 +68,7 @@ const base::FilePath::CharType kComponentUpdatedFlashHint[] =
FILE_PATH_LITERAL("latest-component-updated-flash"); FILE_PATH_LITERAL("latest-component-updated-flash");
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX)
static base::LazyInstance<base::FilePath> static base::LazyInstance<base::FilePath>::DestructorAtExit
g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
// Gets the path for internal plugins. // Gets the path for internal plugins.

View file

@ -97,8 +97,8 @@ enum FlashNavigateUsage {
FLASH_NAVIGATE_USAGE_ENUM_COUNT FLASH_NAVIGATE_USAGE_ENUM_COUNT
}; };
static base::LazyInstance<std::map<std::string, FlashNavigateUsage> > static base::LazyInstance<std::map<std::string, FlashNavigateUsage> >::
g_rejected_headers = LAZY_INSTANCE_INITIALIZER; DestructorAtExit g_rejected_headers = LAZY_INSTANCE_INITIALIZER;
bool IsSimpleHeader(const std::string& lower_case_header_name, bool IsSimpleHeader(const std::string& lower_case_header_name,
const std::string& header_value) { const std::string& header_value) {