diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2017-12-20 16:31:40 +0000 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2017-12-20 16:31:40 +0000 |
commit | de0811ac71004db797d0bba7fba419dca5bad8aa (patch) | |
tree | a27aa310f08ab03bb4eead4e773d3837c9f46b32 | |
parent | 4b54e0fc2abfe7b1fa48425d8e72eb6a146ba49c (diff) |
Fix the definitions of 'reference' and 'pointer' in string_view that no one uses :-). Thanks to K-ballo for the catch.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@321188 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/string_view | 4 | ||||
-rw-r--r-- | test/std/strings/string.view/types.pass.cpp | 77 |
2 files changed, 79 insertions, 2 deletions
diff --git a/include/string_view b/include/string_view index 4d8358288..72cf816e8 100644 --- a/include/string_view +++ b/include/string_view @@ -196,9 +196,9 @@ public: // types typedef _Traits traits_type; typedef _CharT value_type; - typedef const _CharT* pointer; + typedef _CharT* pointer; typedef const _CharT* const_pointer; - typedef const _CharT& reference; + typedef _CharT& reference; typedef const _CharT& const_reference; typedef const_pointer const_iterator; // See [string.view.iterators] typedef const_iterator iterator; diff --git a/test/std/strings/string.view/types.pass.cpp b/test/std/strings/string.view/types.pass.cpp new file mode 100644 index 000000000..68bbc29b9 --- /dev/null +++ b/test/std/strings/string.view/types.pass.cpp @@ -0,0 +1,77 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <string_view> + +// Test nested types and default template args: + +// template<class charT, class traits = char_traits<charT>> +// { +// public: +// // types: +// using traits_type = traits; +// using value_type = charT; +// using pointer = value_type*; +// using const_pointer = const value_type*; +// using reference = value_type&; +// using const_reference = const value_type&; +// using const_iterator = implementation-defined ; // see 24.4.2.2 +// using iterator = const_iterator; +// using const_reverse_iterator = reverse_iterator<const_iterator>; +// using iterator = const_reverse_iterator; +// using size_type = size_t; +// using difference_type = ptrdiff_t; +// static constexpr size_type npos = size_type(-1); +// +// }; + +#include <string_view> +#include <iterator> +#include <type_traits> + +#include "test_macros.h" + +template <class Traits> +void +test() +{ + typedef std::basic_string_view<typename Traits::char_type, Traits> S; + + static_assert((std::is_same<typename S::traits_type, Traits>::value), ""); + static_assert((std::is_same<typename S::value_type, typename Traits::char_type>::value), ""); + static_assert((std::is_same<typename S::size_type, std::size_t>::value), ""); + static_assert((std::is_same<typename S::difference_type, ptrdiff_t>::value), ""); + static_assert((std::is_same<typename S::reference, typename S::value_type&>::value), ""); + static_assert((std::is_same<typename S::const_reference, const typename S::value_type&>::value), ""); + static_assert((std::is_same<typename S::pointer, typename S::value_type*>::value), ""); + static_assert((std::is_same<typename S::const_pointer, const typename S::value_type*>::value), ""); + static_assert((std::is_same< + typename std::iterator_traits<typename S::iterator>::iterator_category, + std::random_access_iterator_tag>::value), ""); + static_assert((std::is_same< + typename std::iterator_traits<typename S::const_iterator>::iterator_category, + std::random_access_iterator_tag>::value), ""); + static_assert((std::is_same< + typename S::reverse_iterator, + std::reverse_iterator<typename S::iterator> >::value), ""); + static_assert((std::is_same< + typename S::const_reverse_iterator, + std::reverse_iterator<typename S::const_iterator> >::value), ""); + static_assert(S::npos == -1, ""); + static_assert((std::is_same<typename S::iterator, typename S::const_iterator>::value), ""); + static_assert((std::is_same<typename S::reverse_iterator, typename S::const_reverse_iterator>::value), ""); +} + +int main() +{ + test<std::char_traits<char> >(); + test<std::char_traits<wchar_t> >(); + static_assert((std::is_same<std::basic_string_view<char>::traits_type, + std::char_traits<char> >::value), ""); +} |