[libcxx] r309958 - Merging r309917:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Thu Aug  3 09:34:10 2017
New Revision: 309958

URL: http://llvm.org/viewvc/llvm-project?rev=309958&view=rev
Log:
Merging r309917:
------------------------------------------------------------------------
r309917 | ericwf | 2017-08-02 19:50:43 -0700 (Wed, 02 Aug 2017) | 4 lines

Add system header pragma to BSD locale fallback headers.

This prevent leaking warnings to the user about use of C++11
extensions in C++03.
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_50/   (props changed)
    libcxx/branches/release_50/include/__bsd_locale_defaults.h
    libcxx/branches/release_50/include/__bsd_locale_fallbacks.h

Propchange: libcxx/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  3 09:34:10 2017
@@ -1 +1,2 @@
 /libcxx/branches/apple:136569-137939
+/libcxx/trunk:309917

Modified: libcxx/branches/release_50/include/__bsd_locale_defaults.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_50/include/__bsd_locale_defaults.h?rev=309958&r1=309957&r2=309958&view=diff
==============================================================================
--- libcxx/branches/release_50/include/__bsd_locale_defaults.h (original)
+++ libcxx/branches/release_50/include/__bsd_locale_defaults.h Thu Aug  3 09:34:10 2017
@@ -15,6 +15,10 @@
 #ifndef _LIBCPP_BSD_LOCALE_DEFAULTS_H
 #define _LIBCPP_BSD_LOCALE_DEFAULTS_H
 
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 #define __libcpp_mb_cur_max_l(loc)                          MB_CUR_MAX_L(loc)
 #define __libcpp_btowc_l(ch, loc)                           btowc_l(ch, loc)
 #define __libcpp_wctob_l(wch, loc)                          wctob_l(wch, loc)

Modified: libcxx/branches/release_50/include/__bsd_locale_fallbacks.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_50/include/__bsd_locale_fallbacks.h?rev=309958&r1=309957&r2=309958&view=diff
==============================================================================
--- libcxx/branches/release_50/include/__bsd_locale_fallbacks.h (original)
+++ libcxx/branches/release_50/include/__bsd_locale_fallbacks.h Thu Aug  3 09:34:10 2017
@@ -18,6 +18,10 @@
 #include <stdarg.h>
 #include <memory>
 
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 inline _LIBCPP_ALWAYS_INLINE