CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits
Module Name:src Committed By: christos Date: Tue Jan 17 12:49:27 UTC 2017 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_heap.h Log Message: use the full attribute syntax To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.3 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.2 Thu Jan 12 14:21:09 2017 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h Tue Jan 17 07:49:26 2017 @@ -263,7 +263,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename iterator_traits<_RandomAccessIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits
Module Name:src Committed By: christos Date: Tue Jan 17 12:48:39 UTC 2017 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_algo.h Log Message: use the full attribute syntax. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.3 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.2 Thu Jan 12 14:21:09 2017 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h Tue Jan 17 07:48:39 2017 @@ -1736,11 +1736,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _RandomAccessIterator __result_last) { typedef typename iterator_traits<_InputIterator>::value_type - _InputValueType __unused; + _InputValueType __attribute__((__unused__)); typedef typename iterator_traits<_RandomAccessIterator>::value_type - _OutputValueType __unused; + _OutputValueType __attribute__((__unused__)); typedef typename iterator_traits<_RandomAccessIterator>::difference_type - _DistanceType __unused; + _DistanceType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) @@ -1786,11 +1786,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Compare __comp) { typedef typename iterator_traits<_InputIterator>::value_type - _InputValueType __unused; + _InputValueType __attribute__((__unused__)); typedef typename iterator_traits<_RandomAccessIterator>::value_type - _OutputValueType __unused; + _OutputValueType __attribute__((__unused__)); typedef typename iterator_traits<_RandomAccessIterator>::difference_type - _DistanceType __unused; + _DistanceType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) @@ -2019,7 +2019,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2076,7 +2076,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2108,7 +2108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2182,7 +2182,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2219,7 +2219,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2255,7 +2255,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2290,7 +2290,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType __unused; + _ValueType __attribute__((__unused__)); // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits
Module Name:src Committed By: christos Date: Thu Jan 12 19:21:09 UTC 2017 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_algo.h stl_heap.h Log Message: sprinkle __unused To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.1.1.5 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h:1.1.1.5 Tue Jun 7 01:57:52 2016 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algo.h Thu Jan 12 14:21:09 2017 @@ -1736,11 +1736,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _RandomAccessIterator __result_last) { typedef typename iterator_traits<_InputIterator>::value_type - _InputValueType; + _InputValueType __unused; typedef typename iterator_traits<_RandomAccessIterator>::value_type - _OutputValueType; + _OutputValueType __unused; typedef typename iterator_traits<_RandomAccessIterator>::difference_type - _DistanceType; + _DistanceType __unused; // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) @@ -1786,11 +1786,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Compare __comp) { typedef typename iterator_traits<_InputIterator>::value_type - _InputValueType; + _InputValueType __unused; typedef typename iterator_traits<_RandomAccessIterator>::value_type - _OutputValueType; + _OutputValueType __unused; typedef typename iterator_traits<_RandomAccessIterator>::difference_type - _DistanceType; + _DistanceType __unused; // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) @@ -2019,7 +2019,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2076,7 +2076,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2108,7 +2108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2182,7 +2182,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2219,7 +2219,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2255,7 +2255,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) @@ -2290,7 +2290,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const _Tp& __val, _Compare __comp) { typedef typename iterator_traits<_ForwardIterator>::value_type - _ValueType; + _ValueType __unused; // concept requirements __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.1.1.3 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h:1.1.1.3 Sun Jan 24 01:05:52 2016 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_heap.h Thu Jan 12 14:21:09 2017 @@ -263,7 +263,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename iterator_traits<_RandomAccessIterator>::value_type - _ValueType; +
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include
Module Name:src Committed By: joerg Date: Sun Mar 24 12:15:51 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: locale_facets.tcc stl_algobase.h src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: numeric_traits.h Log Message: Rename __is_signed to __is_signed_val to avoid conflict with a type trait in Clang. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc:1.1.1.1 Tue Jun 21 01:24:41 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/locale_facets.tcc Sun Mar 24 12:15:50 2013 @@ -464,7 +464,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE bool __testfail = false; bool __testoverflow = false; const __unsigned_type __max = - (__negative __gnu_cxx::__numeric_traits_ValueT::__is_signed) + (__negative __gnu_cxx::__numeric_traits_ValueT::__is_signed_val) ? -__gnu_cxx::__numeric_traits_ValueT::__min : __gnu_cxx::__numeric_traits_ValueT::__max; const __unsigned_type __smax = __max / __base; @@ -568,7 +568,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE else if (__testoverflow) { if (__negative - __gnu_cxx::__numeric_traits_ValueT::__is_signed) + __gnu_cxx::__numeric_traits_ValueT::__is_signed_val) __v = __gnu_cxx::__numeric_traits_ValueT::__min; else __v = __gnu_cxx::__numeric_traits_ValueT::__max; @@ -891,7 +891,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE if (__v = 0) { if (bool(__flags ios_base::showpos) - __gnu_cxx::__numeric_traits_ValueT::__is_signed) + __gnu_cxx::__numeric_traits_ValueT::__is_signed_val) *--__cs = __lit[__num_base::_S_oplus], ++__len; } else Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h:1.1.1.1 Tue Jun 21 01:24:41 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_algobase.h Sun Mar 24 12:15:51 2013 @@ -929,8 +929,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef typename iterator_traits_II2::value_type _ValueType2; const bool __simple = (__is_byte_ValueType1::__value __is_byte_ValueType2::__value - !__gnu_cxx::__numeric_traits_ValueType1::__is_signed - !__gnu_cxx::__numeric_traits_ValueType2::__is_signed + !__gnu_cxx::__numeric_traits_ValueType1::__is_signed_val + !__gnu_cxx::__numeric_traits_ValueType2::__is_signed_val __is_pointer_II1::__value __is_pointer_II2::__value); Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.1.1.1 Tue Jun 21 01:24:44 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h Sun Mar 24 12:15:51 2013 @@ -58,7 +58,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // NB: these two also available in std::numeric_limits as compile // time constants, but limits is big and we avoid including it. - static const bool __is_signed = __glibcxx_signed(_Value); + static const bool __is_signed_val = __glibcxx_signed(_Value); static const int __digits = __glibcxx_digits(_Value); }; @@ -69,7 +69,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) const _Value __numeric_traits_integer_Value::__max; templatetypename _Value -const bool __numeric_traits_integer_Value::__is_signed; +const bool __numeric_traits_integer_Value::__is_signed_val; templatetypename _Value const int __numeric_traits_integer_Value::__digits; @@ -101,7 +101,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) static const int __max_digits10 = __glibcxx_max_digits10(_Value); // See above comment... - static const bool __is_signed = true; + static const bool __is_signed_val = true; static const int __digits10 = __glibcxx_digits10(_Value); static const int __max_exponent10 = __glibcxx_max_exponent10(_Value); }; @@ -110,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) const int
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext
Module Name:src Committed By: joerg Date: Sat Mar 2 23:23:56 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: rope ropeimpl.h Log Message: Fix template lookup. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope:1.1.1.1 Tue Jun 21 01:24:44 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope Sat Mar 2 23:23:55 2013 @@ -727,7 +727,7 @@ protected: if (_M_data != this-_M_c_string) this-_M_free_c_string(); -__STL_FREE_STRING(_M_data, this-_M_size, this-_M_get_allocator()); +this-__STL_FREE_STRING(_M_data, this-_M_size, this-_M_get_allocator()); } #endif protected: @@ -1168,7 +1168,7 @@ protected: operator*() { if (0 == this-_M_buf_ptr) - _S_setcache(*this); + this-_S_setcache(*this); return *this-_M_buf_ptr; } Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.3 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2 Tue Jun 21 06:22:06 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Sat Mar 2 23:23:56 2013 @@ -378,7 +378,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _Rope_RopeLeaf_CharT, _Alloc* __l = (_Rope_RopeLeaf_CharT, _Alloc*)this; __l-_Rope_RopeLeaf_CharT, _Alloc::~_Rope_RopeLeaf(); - _L_deallocate(__l, 1); + this-_L_deallocate(__l, 1); break; } case __detail::_S_concat: @@ -387,7 +387,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) = (_Rope_RopeConcatenation_CharT, _Alloc*)this; __c-_Rope_RopeConcatenation_CharT, _Alloc:: ~_Rope_RopeConcatenation(); - _C_deallocate(__c, 1); + this-_C_deallocate(__c, 1); break; } case __detail::_S_function: @@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _Rope_RopeFunction_CharT, _Alloc* __f = (_Rope_RopeFunction_CharT, _Alloc*)this; __f-_Rope_RopeFunction_CharT, _Alloc::~_Rope_RopeFunction(); - _F_deallocate(__f, 1); + this-_F_deallocate(__f, 1); break; } case __detail::_S_substringfn: @@ -404,7 +404,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) (_Rope_RopeSubstring_CharT, _Alloc*)this; __ss-_Rope_RopeSubstring_CharT, _Alloc:: ~_Rope_RopeSubstring(); - _S_deallocate(__ss, 1); + this-_S_deallocate(__ss, 1); break; } } @@ -509,7 +509,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } __catch(...) { - _C_deallocate(__result,1); + rope::_C_deallocate(__result,1); __throw_exception_again; } // In case of exception, we need to deallocate
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits
Module Name:src Committed By: joerg Date: Thu Nov 8 11:24:01 UTC 2012 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_pair.h Log Message: Provide copy constructor and copy assignment operators for C++11. Clang implements the C++11 semantics properly that require the default to be implicitly deleted. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h:1.1.1.1 Tue Jun 21 01:24:41 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h Thu Nov 8 11:24:00 2012 @@ -107,6 +107,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) pair(_U1 __x, _U2 __y) : first(std::forward_U1(__x)), second(std::forward_U2(__y)) { } + + pair(const pair ) = default; + pair(pair ) = default; #endif /** There is also a templated copy ctor for the @c pair class itself. */ @@ -122,6 +125,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) second(std::forward_U2(__p.second)) { } pair + operator=(const pair __p) + { + first = __p.first; + second = __p.second; + return *this; + } + + pair operator=(pair __p) { first = std::move(__p.first);
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits
Module Name:src Committed By: joerg Date: Thu Nov 8 18:13:53 UTC 2012 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_queue.h Log Message: Merge r163231 from upstream to fix xulrunner build with Clang. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h:1.1.1.1 Tue Jun 21 01:24:41 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h Thu Nov 8 18:13:53 2012 @@ -1,6 +1,6 @@ // Queue implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -137,16 +137,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) explicit queue(_Sequence __c = _Sequence()) : c(std::move(__c)) { } - - queue(queue __q) - : c(std::move(__q.c)) { } - - queue - operator=(queue __q) - { - c = std::move(__q.c); - return *this; - } #endif /** @@ -451,17 +441,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) c.insert(c.end(), __first, __last); std::make_heap(c.begin(), c.end(), comp); } - - priority_queue(priority_queue __pq) - : c(std::move(__pq.c)), comp(std::move(__pq.comp)) { } - - priority_queue - operator=(priority_queue __pq) - { - c = std::move(__pq.c); - comp = std::move(__pq.comp); - return *this; - } #endif /**
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext
Module Name:src Committed By: mrg Date: Tue Jun 21 06:22:06 UTC 2011 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: ropeimpl.h Log Message: pull across from gcc 4.1: revision 1.2 date: 2011/02/05 00:37:40; author: joerg; state: Exp; lines: +2 -2 Explicitly use template to allow building with the more strict template lookup in clang. From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.2 --- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h:1.1.1.1 Tue Jun 21 01:24:44 2011 +++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h Tue Jun 21 06:22:06 2011 @@ -428,7 +428,7 @@ { 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); @@ -812,7 +812,7 @@ 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(...)