From 6c7e5ffc43decd92f7bdfc510ad8a245a20b6dea Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 28 Aug 2018 08:27:02 -0700 Subject: Export of internal Abseil changes. -- a371d3d4e213c65354dd0e8b1aa28673455aec2a by Matt Armstrong : Fix the C++17 build of absl/types/internal/variant.h. If ABSL_HAVE_STD_VARIANT is defined this header is now a nop. While no code should include this header in that case, the build system may still try to compile it, for example, if the Bazel parse_headers feature is on. PiperOrigin-RevId: 210544253 GitOrigin-RevId: a371d3d4e213c65354dd0e8b1aa28673455aec2a Change-Id: I9c02018b86293b7235fcc9e03fb54f1d86c4b096 --- absl/types/internal/variant.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'absl/types/internal') diff --git a/absl/types/internal/variant.h b/absl/types/internal/variant.h index 28ae1a5a7e3c..f220afd04415 100644 --- a/absl/types/internal/variant.h +++ b/absl/types/internal/variant.h @@ -37,6 +37,8 @@ #include "absl/types/bad_variant_access.h" #include "absl/utility/utility.h" +#if !defined(ABSL_HAVE_STD_VARIANT) + namespace absl { template @@ -1612,4 +1614,5 @@ struct VariantHashBase