From cf1db73d2ad969f0ebbe6f5ed42678517e493da2 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 24 Jan 2018 11:58:42 -0800 Subject: Changes imported from Abseil "staging" branch: - 0320844dcd8219965647f86db7c6c7296e40e41e Introduce internal macros for inline variable emulation s... by Matt Calabrese - 85197d0105805e6aab3a0a648351cb1582a61be0 Internal change. by Alex Strelnikov GitOrigin-RevId: 0320844dcd8219965647f86db7c6c7296e40e41e Change-Id: I7dce37f6839ff099462951059a9047c5c9377638 --- absl/utility/utility.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'absl/utility/utility.h') diff --git a/absl/utility/utility.h b/absl/utility/utility.h index d37f4c3..1943c4a 100644 --- a/absl/utility/utility.h +++ b/absl/utility/utility.h @@ -45,6 +45,7 @@ #include #include "absl/base/config.h" +#include "absl/base/internal/inline_variable.h" #include "absl/base/internal/invoke.h" #include "absl/meta/type_traits.h" @@ -155,7 +156,8 @@ using std::in_place; // `absl::optional`, designed to be a drop-in replacement for C++17's // `std::in_place_t`. struct in_place_t {}; -extern const in_place_t in_place; + +ABSL_INTERNAL_INLINE_CONSTEXPR(in_place_t, in_place, {}); #endif // ABSL_HAVE_STD_OPTIONAL -- cgit v1.2.3