From 3086b45a2fae833e8419885e78c598d936cc6429 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Fri, 12 May 2017 03:53:56 +0000
Subject: [PATCH] Fix C++03 test failures caused by static_assert emulation

llvm-svn: 302871
---
 .../conversions/conversions.string/converted.pass.cpp                 | 4 ++--
 .../conversions/conversions.string/from_bytes.pass.cpp                | 4 ++--
 .../conversions/conversions.string/to_bytes.pass.cpp                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
index a3a10e4..480628f 100644
--- a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
+++ b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
@@ -30,7 +30,7 @@ struct TestHelper<CharT, 4> {
 
 template <class CharT>
 void TestHelper<CharT, 2>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     typedef std::codecvt_utf8<CharT> Codecvt;
     typedef std::wstring_convert<Codecvt> Myconv;
@@ -47,7 +47,7 @@ void TestHelper<CharT, 2>::test() {
 
 template <class CharT>
 void TestHelper<CharT, 4>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     typedef std::codecvt_utf8<CharT> Codecvt;
     typedef std::wstring_convert<Codecvt> Myconv;
diff --git a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
index 7e5bfd5..2e627b7 100644
--- a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
+++ b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
@@ -33,7 +33,7 @@ struct TestHelper<CharT, 4> {
 
 template <class CharT>
 void TestHelper<CharT, 2>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
     std::string bs("\xE1\x80\x85\x00");
@@ -52,7 +52,7 @@ void TestHelper<CharT, 2>::test() {
 
 template <class CharT>
 void TestHelper<CharT, 4>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
     std::string bs("\xF1\x80\x80\x83");
diff --git a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
index e10f97b6..0a6cab7 100644
--- a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
+++ b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
@@ -33,7 +33,7 @@ struct TestHelper<CharT, 4> {
 
 template <class CharT>
 void TestHelper<CharT, 2>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
     std::wstring ws(1, CharT(0x1005));
@@ -52,7 +52,7 @@ void TestHelper<CharT, 2>::test() {
 
 template <class CharT>
 void TestHelper<CharT, 4>::test() {
-  static_assert(std::is_same<CharT, wchar_t>::value, "");
+  static_assert((std::is_same<CharT, wchar_t>::value), "");
   {
     std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
     std::wstring ws(1, CharT(0x40003));
-- 
2.7.4