Date: Mon, 1 Mar 2010 21:30:11 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r204537 - in projects/clangbsd/contrib/libstdc++: include/ext src Message-ID: <201003012130.o21LUB0I022574@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Mon Mar 1 21:30:11 2010 New Revision: 204537 URL: http://svn.freebsd.org/changeset/base/204537 Log: Make this a little more like C++. Clang++ can grok all libstdc++ now. Modified: projects/clangbsd/contrib/libstdc++/include/ext/ropeimpl.h projects/clangbsd/contrib/libstdc++/src/locale-inst.cc Modified: projects/clangbsd/contrib/libstdc++/include/ext/ropeimpl.h ============================================================================== --- projects/clangbsd/contrib/libstdc++/include/ext/ropeimpl.h Mon Mar 1 21:04:10 2010 (r204536) +++ projects/clangbsd/contrib/libstdc++/include/ext/ropeimpl.h Mon Mar 1 21:30:11 2010 (r204537) @@ -382,7 +382,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { _Rope_RopeLeaf<_CharT, _Alloc>* __l = (_Rope_RopeLeaf<_CharT, _Alloc>*)this; - __l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf(); + __l->template _Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf(); _L_deallocate(__l, 1); break; } @@ -390,7 +390,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { _Rope_RopeConcatenation<_CharT,_Alloc>* __c = (_Rope_RopeConcatenation<_CharT, _Alloc>*)this; - __c->_Rope_RopeConcatenation<_CharT, _Alloc>:: + __c->template _Rope_RopeConcatenation<_CharT, _Alloc>:: ~_Rope_RopeConcatenation(); _C_deallocate(__c, 1); break; @@ -399,7 +399,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { _Rope_RopeFunction<_CharT, _Alloc>* __f = (_Rope_RopeFunction<_CharT, _Alloc>*)this; - __f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction(); + __f->template _Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction(); _F_deallocate(__f, 1); break; } @@ -407,7 +407,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { _Rope_RopeSubstring<_CharT, _Alloc>* __ss = (_Rope_RopeSubstring<_CharT, _Alloc>*)this; - __ss->_Rope_RopeSubstring<_CharT, _Alloc>:: + __ss->template _Rope_RopeSubstring<_CharT, _Alloc>:: ~_Rope_RopeSubstring(); _S_deallocate(__ss, 1); break; @@ -433,7 +433,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { size_t __old_len = __r->_M_size; _CharT* __new_data = (_CharT*) - _Data_allocate(_S_rounded_up_size(__old_len + __len)); + _Rope_rep_base<_CharT, _Alloc>::_Data_allocate(_S_rounded_up_size(__old_len + __len)); _RopeLeaf* __result; uninitialized_copy_n(__r->_M_data, __old_len, __new_data); @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) if (__result_len > __lazy_threshold) goto lazy; __section = (_CharT*) - _Data_allocate(_S_rounded_up_size(__result_len)); + _Rope_rep_base<_CharT, _Alloc>::_Data_allocate(_S_rounded_up_size(__result_len)); try { (*(__f->_M_fn))(__start, __result_len, __section); } catch(...) Modified: projects/clangbsd/contrib/libstdc++/src/locale-inst.cc ============================================================================== --- projects/clangbsd/contrib/libstdc++/src/locale-inst.cc Mon Mar 1 21:04:10 2010 (r204536) +++ projects/clangbsd/contrib/libstdc++/src/locale-inst.cc Mon Mar 1 21:30:11 2010 (r204537) @@ -180,11 +180,11 @@ _GLIBCXX_END_LDBL_NAMESPACE template class messages_byname<C>; // ctype - inline template class __ctype_abstract_base<C>; + template class __ctype_abstract_base<C>; template class ctype_byname<C>; // codecvt - inline template class __codecvt_abstract_base<C, char, mbstate_t>; + template class __codecvt_abstract_base<C, char, mbstate_t>; template class codecvt_byname<C, char, mbstate_t>; // collate
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003012130.o21LUB0I022574>