Minor cleanup for string_view; mostly from suggestions by Richard Smith. Also, make the tests pass under c++03
llvm-svn: 212185
diff --git a/libcxx/test/experimental/string.view/string.view.access/back.pass.cpp b/libcxx/test/experimental/string.view/string.view.access/back.pass.cpp
index 2c644cd..093a858 100644
--- a/libcxx/test/experimental/string.view/string.view.access/back.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.access/back.pass.cpp
@@ -38,7 +38,7 @@
assert ( test ( U"a", 1 ));
#endif
-#if _LIBCPP_STD_VER > 11
+#if __cplusplus >= 201103L
{
constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 );
static_assert ( sv.length() == 2, "" );
diff --git a/libcxx/test/experimental/string.view/string.view.access/front.pass.cpp b/libcxx/test/experimental/string.view/string.view.access/front.pass.cpp
index f53dfb77..e9df44b 100644
--- a/libcxx/test/experimental/string.view/string.view.access/front.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.access/front.pass.cpp
@@ -38,7 +38,7 @@
assert ( test ( U"a", 1 ));
#endif
-#if _LIBCPP_STD_VER > 11
+#if __cplusplus >= 201103L
{
constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 );
static_assert ( sv.length() == 2, "" );
diff --git a/libcxx/test/experimental/string.view/string.view.capacity/capacity.pass.cpp b/libcxx/test/experimental/string.view/string.view.capacity/capacity.pass.cpp
index 6919be3..eb80216 100644
--- a/libcxx/test/experimental/string.view/string.view.capacity/capacity.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.capacity/capacity.pass.cpp
@@ -53,10 +53,10 @@
}
int main () {
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
test1<string_view> ();
test1<u16string_view> ();
diff --git a/libcxx/test/experimental/string.view/string.view.cons/default.pass.cpp b/libcxx/test/experimental/string.view/string.view.cons/default.pass.cpp
index 4359fb6..e1d69f4 100644
--- a/libcxx/test/experimental/string.view/string.view.cons/default.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.cons/default.pass.cpp
@@ -33,10 +33,10 @@
}
int main () {
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
test<string_view> ();
test<u16string_view> ();
diff --git a/libcxx/test/experimental/string.view/string.view.iterators/begin.pass.cpp b/libcxx/test/experimental/string.view/string.view.iterators/begin.pass.cpp
index 68fe597..07f3b36 100644
--- a/libcxx/test/experimental/string.view/string.view.iterators/begin.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.iterators/begin.pass.cpp
@@ -40,10 +40,10 @@
int main()
{
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
test(string_view ());
test(u16string_view());
diff --git a/libcxx/test/experimental/string.view/string.view.iterators/end.pass.cpp b/libcxx/test/experimental/string.view/string.view.iterators/end.pass.cpp
index 07028e7..2ed52b8 100644
--- a/libcxx/test/experimental/string.view/string.view.iterators/end.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.iterators/end.pass.cpp
@@ -48,10 +48,10 @@
int main()
{
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
test(string_view ());
test(u16string_view());
diff --git a/libcxx/test/experimental/string.view/string.view.iterators/rbegin.pass.cpp b/libcxx/test/experimental/string.view/string.view.iterators/rbegin.pass.cpp
index c5bf3c0..7d1c700 100644
--- a/libcxx/test/experimental/string.view/string.view.iterators/rbegin.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.iterators/rbegin.pass.cpp
@@ -41,10 +41,10 @@
int main()
{
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
test(string_view ());
test(u16string_view());
diff --git a/libcxx/test/experimental/string.view/string.view.iterators/rend.pass.cpp b/libcxx/test/experimental/string.view/string.view.iterators/rend.pass.cpp
index aa54883..57002f3 100644
--- a/libcxx/test/experimental/string.view/string.view.iterators/rend.pass.cpp
+++ b/libcxx/test/experimental/string.view/string.view.iterators/rend.pass.cpp
@@ -48,11 +48,11 @@
int main()
{
- using string_view = std::experimental::string_view;
- using u16string_view = std::experimental::u16string_view;
- using u32string_view = std::experimental::u32string_view;
- using wstring_view = std::experimental::wstring_view;
-
+ typedef std::experimental::string_view string_view;
+ typedef std::experimental::u16string_view u16string_view;
+ typedef std::experimental::u32string_view u32string_view;
+ typedef std::experimental::wstring_view wstring_view;
+
test(string_view ());
test(u16string_view());
test(u32string_view());