diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-09-19 23:31:34 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-09-19 23:31:34 +0000 |
| commit | 8d6ac8f689f7f8a3777555e3a96bcbab45a3df68 (patch) | |
| tree | 9a61aac12b0d85fadf4e8aa34eff3ba424b79a20 /libcxx/include/ostream | |
| parent | 120ca61d7d329e1a1de3236b1517e3f4a53e9eea (diff) | |
| download | bcm5719-llvm-8d6ac8f689f7f8a3777555e3a96bcbab45a3df68.tar.gz bcm5719-llvm-8d6ac8f689f7f8a3777555e3a96bcbab45a3df68.zip | |
Revert "Implement LWG 2221 - No formatted output operator for nullptr."
This reverts r342566 as it causes on bots linker errors like
> Undefined symbols for architecture i386:
> "std::__1::basic_ostream<char, std::__1::char_traits<char> >::operator<<(std::nullptr_t)", referenced from:
llvm-svn: 342599
Diffstat (limited to 'libcxx/include/ostream')
| -rw-r--r-- | libcxx/include/ostream | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libcxx/include/ostream b/libcxx/include/ostream index c29157077b4..5404e0dca6c 100644 --- a/libcxx/include/ostream +++ b/libcxx/include/ostream @@ -56,7 +56,6 @@ public: basic_ostream& operator<<(double f); basic_ostream& operator<<(long double f); basic_ostream& operator<<(const void* p); - basic_ostream<charT, traits>& operator<<(nullptr_t); // C++17 basic_ostream& operator<<(basic_streambuf<char_type,traits>* sb); // 27.7.2.7 Unformatted output: @@ -217,7 +216,6 @@ public: basic_ostream& operator<<(double __f); basic_ostream& operator<<(long double __f); basic_ostream& operator<<(const void* __p); - basic_ostream& operator<<(nullptr_t); basic_ostream& operator<<(basic_streambuf<char_type, traits_type>* __sb); // 27.7.2.7 Unformatted output: @@ -711,14 +709,6 @@ basic_ostream<_CharT, _Traits>::operator<<(const void* __n) return *this; } -template <class _CharT, class _Traits> -basic_ostream<_CharT, _Traits>& -basic_ostream<_CharT, _Traits>::operator<<(nullptr_t) -{ - return *this << "(nullptr)"; -} - - template<class _CharT, class _Traits> basic_ostream<_CharT, _Traits>& __put_character_sequence(basic_ostream<_CharT, _Traits>& __os, @@ -752,6 +742,7 @@ __put_character_sequence(basic_ostream<_CharT, _Traits>& __os, return __os; } + template<class _CharT, class _Traits> basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c) |
