Add static_asserts to basic_ios and basic_stream_buf to ensure that that the traits match the character type. This is a requirement on the user - now we get consistent failures at compile time instead of incomprehensible error messages or runtime failures. This is also LWG#2994 - not yet adopted.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@323945 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -592,6 +592,9 @@ public:
|
|||||||
typedef typename traits_type::pos_type pos_type;
|
typedef typename traits_type::pos_type pos_type;
|
||||||
typedef typename traits_type::off_type off_type;
|
typedef typename traits_type::off_type off_type;
|
||||||
|
|
||||||
|
static_assert((is_same<_CharT, typename traits_type::char_type>::value),
|
||||||
|
"traits_type::char_type must be the same type as CharT");
|
||||||
|
|
||||||
// __true_value will generate undefined references when linking unless
|
// __true_value will generate undefined references when linking unless
|
||||||
// we give it internal linkage.
|
// we give it internal linkage.
|
||||||
|
|
||||||
|
|||||||
@@ -132,6 +132,9 @@ public:
|
|||||||
typedef typename traits_type::pos_type pos_type;
|
typedef typename traits_type::pos_type pos_type;
|
||||||
typedef typename traits_type::off_type off_type;
|
typedef typename traits_type::off_type off_type;
|
||||||
|
|
||||||
|
static_assert((is_same<_CharT, typename traits_type::char_type>::value),
|
||||||
|
"traits_type::char_type must be the same type as CharT");
|
||||||
|
|
||||||
virtual ~basic_streambuf();
|
virtual ~basic_streambuf();
|
||||||
|
|
||||||
// 27.6.2.2.1 locales:
|
// 27.6.2.2.1 locales:
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// <fstream>
|
||||||
|
|
||||||
|
// template<class charT, class traits = char_traits<charT>>
|
||||||
|
// class basic_filebuf;
|
||||||
|
//
|
||||||
|
// The char type of the stream and the char_type of the traits have to match
|
||||||
|
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
std::basic_filebuf<char, std::char_traits<wchar_t> > f;
|
||||||
|
// expected-error-re@streambuf:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// <fstream>
|
||||||
|
|
||||||
|
// template <class charT, class traits = char_traits<charT> >
|
||||||
|
// class basic_fstream
|
||||||
|
|
||||||
|
// The char type of the stream and the char_type of the traits have to match
|
||||||
|
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
std::basic_fstream<char, std::char_traits<wchar_t> > f;
|
||||||
|
// expected-error-re@ios:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
// expected-error-re@streambuf:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// <istream>
|
||||||
|
|
||||||
|
// template <class charT, class traits = char_traits<charT> >
|
||||||
|
// class basic_istream;
|
||||||
|
|
||||||
|
// The char type of the stream and the char_type of the traits have to match
|
||||||
|
|
||||||
|
#include <istream>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
|
struct test_istream
|
||||||
|
: public std::basic_istream<char, std::char_traits<wchar_t> > {};
|
||||||
|
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
// expected-error-re@ios:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// <ostream>
|
||||||
|
|
||||||
|
// template <class charT, class traits = char_traits<charT> >
|
||||||
|
// class basic_ostream;
|
||||||
|
|
||||||
|
// The char type of the stream and the char_type of the traits have to match
|
||||||
|
|
||||||
|
#include <ostream>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <cassert>
|
||||||
|
|
||||||
|
struct test_ostream
|
||||||
|
: public std::basic_ostream<char, std::char_traits<wchar_t> > {};
|
||||||
|
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
// expected-error-re@ios:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
//
|
||||||
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
// <sstream>
|
||||||
|
|
||||||
|
// template<class charT, class traits = char_traits<charT>,
|
||||||
|
// class Allocator = allocator<charT>>
|
||||||
|
// class basic_stringbuf;
|
||||||
|
//
|
||||||
|
// The char type of the stream and the char_type of the traits have to match
|
||||||
|
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
std::basic_stringbuf<char, std::char_traits<wchar_t> > sb;
|
||||||
|
// expected-error-re@streambuf:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
// expected-error-re@string:* {{static_assert failed{{.*}} "traits_type::char_type must be the same type as CharT"}}
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user