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/map.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/google/protobuf/map.h')

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index a75fb786..6463ac2e 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -37,6 +37,7 @@
 #ifndef GOOGLE_PROTOBUF_MAP_H__
 #define GOOGLE_PROTOBUF_MAP_H__
 
+#include <initializer_list>
 #include <iterator>
 #include <limits>  // To support Visual Studio 2008
 #include <set>
@@ -48,10 +49,6 @@
 #include <google/protobuf/map_type_handler.h>
 #include <google/protobuf/stubs/hash.h>
 
-#if LANG_CXX11
-#include <initializer_list>
-#endif
-
 namespace google {
 namespace protobuf {
 
@@ -146,7 +143,6 @@ class Map {
     insert(other.begin(), other.end());
   }
 
-#if LANG_CXX11
   Map(Map&& other) noexcept : Map() {
     if (other.arena_) {
       *this = other;
@@ -164,7 +160,6 @@ class Map {
     }
     return *this;
   }
-#endif
 
   template <class InputIt>
   Map(const InputIt& first, const InputIt& last)
@@ -1117,11 +1112,9 @@ class Map {
       }
     }
   }
-#if LANG_CXX11
   void insert(std::initializer_list<value_type> values) {
     insert(values.begin(), values.end());
   }
-#endif
 
   // Erase and clear
   size_type erase(const key_type& key) {
-- 
cgit v1.2.3