From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 13 Mar 2018 16:37:29 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/generated_message_table_driven.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/google/protobuf/generated_message_table_driven.cc')

diff --git a/src/google/protobuf/generated_message_table_driven.cc b/src/google/protobuf/generated_message_table_driven.cc
index 29af1ef6..d4450a6c 100644
--- a/src/google/protobuf/generated_message_table_driven.cc
+++ b/src/google/protobuf/generated_message_table_driven.cc
@@ -30,8 +30,9 @@
 
 #include <google/protobuf/generated_message_table_driven.h>
 
-#include <google/protobuf/stubs/type_traits.h>
+#include <type_traits>
 
+#include <google/protobuf/stubs/casts.h>
 #include <google/protobuf/generated_message_table_driven_lite.h>
 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 #include <google/protobuf/metadata.h>
-- 
cgit v1.2.3