summaryrefslogtreecommitdiff
path: root/base/optional.h
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2017-04-06 02:59:27 +0900
committerQijiang Fan <fqj@google.com>2020-06-05 05:45:18 +0900
commitd61a194056e3fbd033a841948519cae80b232853 (patch)
tree426ab164a11932c3bf224921b2b18697a79df8be /base/optional.h
parent99debb14605a810627bf2d8e1462a923384b6db0 (diff)
downloadlibchrome-d61a194056e3fbd033a841948519cae80b232853.tar.gz
Remove base::is_trivially_destructible and use the standard library.
This is available in our linux sysroot now, so we can drop the implementation in base. R=dcheng@chromium.org TBR=jbauman@chromium.org BUG=554293 Review-Url: https://codereview.chromium.org/2792183003 Cr-Commit-Position: refs/heads/master@{#462141} CrOS-Libchrome-Original-Commit: 90acaf829ceba5299b4823723f44ac72bfabf3d8
Diffstat (limited to 'base/optional.h')
-rw-r--r--base/optional.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/optional.h b/base/optional.h
index cf65ad7dac..2be2f82175 100644
--- a/base/optional.h
+++ b/base/optional.h
@@ -8,7 +8,6 @@
#include <type_traits>
#include "base/logging.h"
-#include "base/template_util.h"
namespace base {
@@ -32,7 +31,7 @@ constexpr nullopt_t nullopt(0);
namespace internal {
-template <typename T, bool = base::is_trivially_destructible<T>::value>
+template <typename T, bool = std::is_trivially_destructible<T>::value>
struct OptionalStorage {
// Initializing |empty_| here instead of using default member initializing
// to avoid errors in g++ 4.8.