From owner-svn-src-all@FreeBSD.ORG Tue Aug 24 13:38:53 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77C2F1065695; Tue, 24 Aug 2010 13:38:53 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 62EF58FC08; Tue, 24 Aug 2010 13:38:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7ODcroU077793; Tue, 24 Aug 2010 13:38:53 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7ODcr1T077789; Tue, 24 Aug 2010 13:38:53 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201008241338.o7ODcr1T077789@svn.freebsd.org> From: Rui Paulo Date: Tue, 24 Aug 2010 13:38:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211755 - in head/contrib/libstdc++: include/ext src X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2010 13:38:53 -0000 Author: rpaulo Date: Tue Aug 24 13:38:53 2010 New Revision: 211755 URL: http://svn.freebsd.org/changeset/base/211755 Log: Some fixes so we can build libstdc++ with clang: o Make the value_type, vector_type, iterator, __mutex_type types of free_list class so we can access them o In some cases template keywords must be inserted to treat classes as dependent template names o Remove two 'inline' keywords where they do not make sense Submitted by: Dimitry Andric Reviewed by: trema Modified: head/contrib/libstdc++/include/ext/bitmap_allocator.h head/contrib/libstdc++/include/ext/ropeimpl.h head/contrib/libstdc++/src/locale-inst.cc Modified: head/contrib/libstdc++/include/ext/bitmap_allocator.h ============================================================================== --- head/contrib/libstdc++/include/ext/bitmap_allocator.h Tue Aug 24 13:22:01 2010 (r211754) +++ head/contrib/libstdc++/include/ext/bitmap_allocator.h Tue Aug 24 13:38:53 2010 (r211755) @@ -549,11 +549,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) */ class free_list { + public: typedef size_t* value_type; typedef __detail::__mini_vector vector_type; typedef vector_type::iterator iterator; typedef __mutex __mutex_type; + private: struct _LT_pointer_compare { bool Modified: head/contrib/libstdc++/include/ext/ropeimpl.h ============================================================================== --- head/contrib/libstdc++/include/ext/ropeimpl.h Tue Aug 24 13:22:01 2010 (r211754) +++ head/contrib/libstdc++/include/ext/ropeimpl.h Tue Aug 24 13:38:53 2010 (r211755) @@ -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: head/contrib/libstdc++/src/locale-inst.cc ============================================================================== --- head/contrib/libstdc++/src/locale-inst.cc Tue Aug 24 13:22:01 2010 (r211754) +++ head/contrib/libstdc++/src/locale-inst.cc Tue Aug 24 13:38:53 2010 (r211755) @@ -180,11 +180,11 @@ _GLIBCXX_END_LDBL_NAMESPACE template class messages_byname; // ctype - inline template class __ctype_abstract_base; + template class __ctype_abstract_base; template class ctype_byname; // codecvt - inline template class __codecvt_abstract_base; + template class __codecvt_abstract_base; template class codecvt_byname; // collate