summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-01-22 00:17:48 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-01-22 00:17:48 +0000
commit785ae3e8c053a8f2b14851e09a27fc343c4d37dd (patch)
tree6773bc6f113ee8a35a6a3201b77bb8613d810ce7
parent85642c2bea823d5eed087ee64da030ab767fb00e (diff)
downloadbcm5719-llvm-785ae3e8c053a8f2b14851e09a27fc343c4d37dd.tar.gz
bcm5719-llvm-785ae3e8c053a8f2b14851e09a27fc343c4d37dd.zip
Change a static_assert to check for is_trivial instead of is_pod, as is mandated by P0767.
llvm-svn: 323071
-rw-r--r--libcxx/include/string2
-rw-r--r--libcxx/include/string_view2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/string b/libcxx/include/string
index f5d548965aa..b213cd411d1 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -651,7 +651,7 @@ public:
typedef typename __alloc_traits::pointer pointer;
typedef typename __alloc_traits::const_pointer const_pointer;
- static_assert(is_pod<value_type>::value, "Character type of basic_string must be a POD");
+ static_assert(is_trivial<value_type>::value, "Character type of basic_string must be trivial");
static_assert((is_same<_CharT, typename traits_type::char_type>::value),
"traits_type::char_type must be the same type as CharT");
static_assert((is_same<typename allocator_type::value_type, value_type>::value),
diff --git a/libcxx/include/string_view b/libcxx/include/string_view
index 72cf816e8d5..fd8c3790bae 100644
--- a/libcxx/include/string_view
+++ b/libcxx/include/string_view
@@ -208,7 +208,7 @@ public:
typedef ptrdiff_t difference_type;
static _LIBCPP_CONSTEXPR const size_type npos = -1; // size_type(-1);
- static_assert(is_pod<value_type>::value, "Character type of basic_string_view must be a POD");
+ static_assert(is_trivial<value_type>::value, "Character type of basic_string_view must be trivial");
static_assert((is_same<_CharT, typename traits_type::char_type>::value),
"traits_type::char_type must be the same type as CharT");
OpenPOWER on IntegriCloud