From 208ee5a09da49ad1f5fea60a3e12f6ac9ed6f709 Mon Sep 17 00:00:00 2001
From: Akira Hatanaka <ahatanaka@apple.com>
Date: Thu, 28 Jan 2016 06:13:36 +0000
Subject: [PATCH] [libcxx] Remove pragmas that were needed to suppress warnings
 produced by -Wpadded.

We don't need these pragmas anymore because -Wpadded was removed from
buildit in r258900.

llvm-svn: 259023
---
 libcxx/src/locale.cpp |  9 ---------
 libcxx/src/regex.cpp  | 18 ------------------
 2 files changed, 27 deletions(-)

diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index 6b04e7881764..c973e5825fbd 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -123,11 +123,6 @@ const locale::category locale::time;
 const locale::category locale::messages;
 const locale::category locale::all;
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 class _LIBCPP_HIDDEN locale::__imp
     : public facet
 {
@@ -163,10 +158,6 @@ private:
     template <class F> void install_from(const __imp& other);
 };
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 locale::__imp::__imp(size_t refs)
     : facet(refs),
       facets_(N),
diff --git a/libcxx/src/regex.cpp b/libcxx/src/regex.cpp
index 17dd6eaa60a7..a7363599d5a5 100644
--- a/libcxx/src/regex.cpp
+++ b/libcxx/src/regex.cpp
@@ -69,21 +69,12 @@ regex_error::~regex_error() throw() {}
 
 namespace {
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 struct collationnames
 {
     const char* elem_;
     char char_;
 };
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 const collationnames collatenames[] =
 {
     {"A", 0x41},
@@ -199,21 +190,12 @@ const collationnames collatenames[] =
     {"zero", 0x30}
 };
 
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 struct classnames
 {
     const char* elem_;
     regex_traits<char>::char_class_type mask_;
 };
 
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 const classnames ClassNames[] =
 {
     {"alnum",  ctype_base::alnum},