Commit 56019fd0 authored by Eric Seckler's avatar Eric Seckler Committed by Commit Bot

base: Remove NoDestructor from GetTaskExecutorMap().

Change-Id: I5a483b0100ab76e52dcb88d379f46721b0b86bbc
Reviewed-on: https://chromium-review.googlesource.com/1184717
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585140}
parent b4ebe550
......@@ -4,7 +4,8 @@
#include "base/task/task_executor.h"
#include "base/no_destructor.h"
#include <type_traits>
#include "base/task/task_traits.h"
#include "base/task/task_traits_extension.h"
......@@ -17,8 +18,10 @@ namespace {
using TaskExecutorMap =
std::array<TaskExecutor*, TaskTraitsExtensionStorage::kMaxExtensionId>;
TaskExecutorMap* GetTaskExecutorMap() {
static NoDestructor<TaskExecutorMap> executors(TaskExecutorMap{});
return executors.get();
static_assert(std::is_trivially_destructible<TaskExecutorMap>::value,
"TaskExecutorMap not trivially destructible");
static TaskExecutorMap executors{};
return &executors;
}
static_assert(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment