2003-01-24 17:32:11 +01:00
|
|
|
// The template and inlines for the -*- C++ -*- internal _Meta class.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
2010-02-06 21:41:09 +01:00
|
|
|
// 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
2003-01-24 17:32:11 +01:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2003-01-24 17:32:11 +01:00
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2003-01-24 17:32:11 +01:00
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
/** @file bits/valarray_before.h
|
2003-01-24 17:32:11 +01:00
|
|
|
* This is an internal header file, included by other library headers.
|
2010-12-19 10:21:16 +01:00
|
|
|
* Do not attempt to use it directly. @headername{valarray}
|
2003-01-24 17:32:11 +01:00
|
|
|
*/
|
|
|
|
|
2006-12-06 00:24:07 +01:00
|
|
|
// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@cmla.ens-cachan.fr>
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#ifndef _VALARRAY_BEFORE_H
|
|
|
|
#define _VALARRAY_BEFORE_H 1
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
|
|
|
#include <bits/slice_array.h>
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-12-19 01:56:05 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
//
|
|
|
|
// Implementing a loosened valarray return value is tricky.
|
|
|
|
// First we need to meet 26.3.1/3: we should not add more than
|
|
|
|
// two levels of template nesting. Therefore we resort to template
|
|
|
|
// template to "flatten" loosened return value types.
|
|
|
|
// At some point we use partial specialization to remove one level
|
|
|
|
// template nesting due to _Expr<>
|
|
|
|
//
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
// This class is NOT defined. It doesn't need to.
|
|
|
|
template<typename _Tp1, typename _Tp2> class _Constant;
|
|
|
|
|
|
|
|
// Implementations of unary functions applied to valarray<>s.
|
|
|
|
// I use hard-coded object functions here instead of a generic
|
|
|
|
// approach like pointers to function:
|
|
|
|
// 1) correctness: some functions take references, others values.
|
|
|
|
// we can't deduce the correct type afterwards.
|
|
|
|
// 2) efficiency -- object functions can be easily inlined
|
|
|
|
// 3) be Koenig-lookup-friendly
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Abs
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return abs(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Cos
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return cos(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Acos
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return acos(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Cosh
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return cosh(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Sin
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return sin(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Asin
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return asin(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Sinh
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return sinh(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Tan
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return tan(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Atan
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return atan(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Tanh
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return tanh(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Exp
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return exp(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Log
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return log(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Log10
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return log10(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Sqrt
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return sqrt(__t); }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
// In the past, we used to tailor operator applications semantics
|
|
|
|
// to the specialization of standard function objects (i.e. plus<>, etc.)
|
|
|
|
// That is incorrect. Therefore we provide our own surrogates.
|
|
|
|
|
|
|
|
struct __unary_plus
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return +__t; }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct __negate
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return -__t; }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct __bitwise_not
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
_Tp operator()(const _Tp& __t) const
|
|
|
|
{ return ~__t; }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct __plus
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x + __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __minus
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x - __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __multiplies
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x * __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __divides
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x / __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __modulus
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x % __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __bitwise_xor
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x ^ __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __bitwise_and
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x & __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __bitwise_or
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x | __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __shift_left
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x << __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __shift_right
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x >> __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __logical_and
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x && __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __logical_or
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x || __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __logical_not
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
2010-02-06 21:41:09 +01:00
|
|
|
bool operator()(const _Tp& __x) const
|
|
|
|
{ return !__x; }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct __equal_to
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x == __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __not_equal_to
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
2003-02-03 11:38:36 +01:00
|
|
|
{ return __x != __y; }
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct __less
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x < __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __greater
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x > __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __less_equal
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x <= __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct __greater_equal
|
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
bool operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return __x >= __y; }
|
|
|
|
};
|
|
|
|
|
|
|
|
// The few binary functions we miss.
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Atan2
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return atan2(__x, __y); }
|
|
|
|
};
|
|
|
|
|
2010-02-06 21:41:09 +01:00
|
|
|
struct _Pow
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
template<typename _Tp>
|
|
|
|
_Tp operator()(const _Tp& __x, const _Tp& __y) const
|
|
|
|
{ return pow(__x, __y); }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
// We need these bits in order to recover the return type of
|
|
|
|
// some functions/operators now that we're no longer using
|
|
|
|
// function templates.
|
|
|
|
template<typename, typename _Tp>
|
|
|
|
struct __fun
|
|
|
|
{
|
|
|
|
typedef _Tp result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
// several specializations for relational operators.
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__logical_not, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__logical_and, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__logical_or, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__less, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__greater, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__less_equal, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__greater_equal, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__equal_to, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct __fun<__not_equal_to, _Tp>
|
|
|
|
{
|
|
|
|
typedef bool result_type;
|
|
|
|
};
|
|
|
|
|
2004-07-08 22:48:04 +02:00
|
|
|
//
|
|
|
|
// Apply function taking a value/const reference closure
|
|
|
|
//
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
template<typename _Dom, typename _Arg>
|
2004-02-08 05:46:42 +01:00
|
|
|
class _FunBase
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename _Dom::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_FunBase(const _Dom& __e, value_type __f(_Arg))
|
2004-07-08 22:48:04 +02:00
|
|
|
: _M_expr(__e), _M_func(__f) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
value_type operator[](size_t __i) const
|
|
|
|
{ return _M_func (_M_expr[__i]); }
|
|
|
|
|
|
|
|
size_t size() const { return _M_expr.size ();}
|
|
|
|
|
|
|
|
private:
|
2004-07-08 22:48:04 +02:00
|
|
|
const _Dom& _M_expr;
|
|
|
|
value_type (*_M_func)(_Arg);
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Dom>
|
2004-02-08 05:46:42 +01:00
|
|
|
struct _ValFunClos<_Expr,_Dom> : _FunBase<_Dom, typename _Dom::value_type>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef _FunBase<_Dom, typename _Dom::value_type> _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef value_type _Tp;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_ValFunClos(const _Dom& __e, _Tp __f(_Tp)) : _Base(__e, __f) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
struct _ValFunClos<_ValArray,_Tp> : _FunBase<valarray<_Tp>, _Tp>
|
|
|
|
{
|
|
|
|
typedef _FunBase<valarray<_Tp>, _Tp> _Base;
|
|
|
|
typedef _Tp value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_ValFunClos(const valarray<_Tp>& __v, _Tp __f(_Tp)) : _Base(__v, __f) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _RefFunClos<_Expr, _Dom>
|
|
|
|
: _FunBase<_Dom, const typename _Dom::value_type&>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef _FunBase<_Dom, const typename _Dom::value_type&> _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef value_type _Tp;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_RefFunClos(const _Dom& __e, _Tp __f(const _Tp&))
|
2004-07-08 22:48:04 +02:00
|
|
|
: _Base(__e, __f) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _RefFunClos<_ValArray, _Tp>
|
|
|
|
: _FunBase<valarray<_Tp>, const _Tp&>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef _FunBase<valarray<_Tp>, const _Tp&> _Base;
|
|
|
|
typedef _Tp value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_RefFunClos(const valarray<_Tp>& __v, _Tp __f(const _Tp&))
|
2004-07-08 22:48:04 +02:00
|
|
|
: _Base(__v, __f) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
//
|
|
|
|
// Unary expression closure.
|
|
|
|
//
|
|
|
|
|
|
|
|
template<class _Oper, class _Arg>
|
|
|
|
class _UnBase
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename _Arg::value_type _Vt;
|
|
|
|
typedef typename __fun<_Oper, _Vt>::result_type value_type;
|
|
|
|
|
|
|
|
_UnBase(const _Arg& __e) : _M_expr(__e) {}
|
|
|
|
|
|
|
|
value_type operator[](size_t __i) const
|
2003-02-03 11:38:36 +01:00
|
|
|
{ return _Oper()(_M_expr[__i]); }
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
size_t size() const { return _M_expr.size(); }
|
2004-07-08 22:48:04 +02:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
private:
|
|
|
|
const _Arg& _M_expr;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _UnClos<_Oper, _Expr, _Dom>
|
|
|
|
: _UnBase<_Oper, _Dom>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef _Dom _Arg;
|
|
|
|
typedef _UnBase<_Oper, _Dom> _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_UnClos(const _Arg& __e) : _Base(__e) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _UnClos<_Oper, _ValArray, _Tp>
|
|
|
|
: _UnBase<_Oper, valarray<_Tp> >
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef valarray<_Tp> _Arg;
|
|
|
|
typedef _UnBase<_Oper, valarray<_Tp> > _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_UnClos(const _Arg& __e) : _Base(__e) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// Binary expression closure.
|
|
|
|
//
|
|
|
|
|
|
|
|
template<class _Oper, class _FirstArg, class _SecondArg>
|
2004-02-08 05:46:42 +01:00
|
|
|
class _BinBase
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
public:
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef typename _FirstArg::value_type _Vt;
|
|
|
|
typedef typename __fun<_Oper, _Vt>::result_type value_type;
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
_BinBase(const _FirstArg& __e1, const _SecondArg& __e2)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _M_expr1(__e1), _M_expr2(__e2) {}
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
value_type operator[](size_t __i) const
|
|
|
|
{ return _Oper()(_M_expr1[__i], _M_expr2[__i]); }
|
|
|
|
|
|
|
|
size_t size() const { return _M_expr1.size(); }
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
private:
|
|
|
|
const _FirstArg& _M_expr1;
|
|
|
|
const _SecondArg& _M_expr2;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
template<class _Oper, class _Clos>
|
|
|
|
class _BinBase2
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename _Clos::value_type _Vt;
|
|
|
|
typedef typename __fun<_Oper, _Vt>::result_type value_type;
|
|
|
|
|
|
|
|
_BinBase2(const _Clos& __e, const _Vt& __t)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _M_expr1(__e), _M_expr2(__t) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
value_type operator[](size_t __i) const
|
|
|
|
{ return _Oper()(_M_expr1[__i], _M_expr2); }
|
|
|
|
|
|
|
|
size_t size() const { return _M_expr1.size(); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
const _Clos& _M_expr1;
|
|
|
|
const _Vt& _M_expr2;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Clos>
|
|
|
|
class _BinBase1
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef typename _Clos::value_type _Vt;
|
|
|
|
typedef typename __fun<_Oper, _Vt>::result_type value_type;
|
|
|
|
|
|
|
|
_BinBase1(const _Vt& __t, const _Clos& __e)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _M_expr1(__t), _M_expr2(__e) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
value_type operator[](size_t __i) const
|
|
|
|
{ return _Oper()(_M_expr1, _M_expr2[__i]); }
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
size_t size() const { return _M_expr2.size(); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
const _Vt& _M_expr1;
|
|
|
|
const _Clos& _M_expr2;
|
|
|
|
};
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
template<class _Oper, class _Dom1, class _Dom2>
|
|
|
|
struct _BinClos<_Oper, _Expr, _Expr, _Dom1, _Dom2>
|
2004-07-08 22:48:04 +02:00
|
|
|
: _BinBase<_Oper, _Dom1, _Dom2>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _BinBase<_Oper, _Dom1, _Dom2> _Base;
|
2003-01-24 17:32:11 +01:00
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const _Dom1& __e1, const _Dom2& __e2) : _Base(__e1, __e2) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper,_ValArray, _ValArray, _Tp, _Tp>
|
|
|
|
: _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> >
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> > _Base;
|
2006-06-04 11:32:56 +02:00
|
|
|
typedef typename _Base::value_type value_type;
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
_BinClos(const valarray<_Tp>& __v, const valarray<_Tp>& __w)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _Base(__v, __w) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _Expr, _ValArray, _Dom, typename _Dom::value_type>
|
|
|
|
: _BinBase<_Oper, _Dom, valarray<typename _Dom::value_type> >
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef typename _Dom::value_type _Tp;
|
|
|
|
typedef _BinBase<_Oper,_Dom,valarray<_Tp> > _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const _Dom& __e1, const valarray<_Tp>& __e2)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _Base(__e1, __e2) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _ValArray, _Expr, typename _Dom::value_type, _Dom>
|
|
|
|
: _BinBase<_Oper, valarray<typename _Dom::value_type>,_Dom>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef typename _Dom::value_type _Tp;
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _BinBase<_Oper, valarray<_Tp>, _Dom> _Base;
|
2003-01-24 17:32:11 +01:00
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const valarray<_Tp>& __e1, const _Dom& __e2)
|
2004-07-08 22:48:04 +02:00
|
|
|
: _Base(__e1, __e2) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _Expr, _Constant, _Dom, typename _Dom::value_type>
|
|
|
|
: _BinBase2<_Oper, _Dom>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef typename _Dom::value_type _Tp;
|
|
|
|
typedef _BinBase2<_Oper,_Dom> _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const _Dom& __e1, const _Tp& __e2) : _Base(__e1, __e2) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, class _Dom>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _Constant, _Expr, typename _Dom::value_type, _Dom>
|
|
|
|
: _BinBase1<_Oper, _Dom>
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef typename _Dom::value_type _Tp;
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _BinBase1<_Oper, _Dom> _Base;
|
2003-01-24 17:32:11 +01:00
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const _Tp& __e1, const _Dom& __e2) : _Base(__e1, __e2) {}
|
|
|
|
};
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
template<class _Oper, typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _ValArray, _Constant, _Tp, _Tp>
|
|
|
|
: _BinBase2<_Oper, valarray<_Tp> >
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
|
|
|
typedef _BinBase2<_Oper,valarray<_Tp> > _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const valarray<_Tp>& __v, const _Tp& __t) : _Base(__v, __t) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<class _Oper, typename _Tp>
|
2004-07-08 22:48:04 +02:00
|
|
|
struct _BinClos<_Oper, _Constant, _ValArray, _Tp, _Tp>
|
|
|
|
: _BinBase1<_Oper, valarray<_Tp> >
|
2003-01-24 17:32:11 +01:00
|
|
|
{
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _BinBase1<_Oper, valarray<_Tp> > _Base;
|
2003-01-24 17:32:11 +01:00
|
|
|
typedef typename _Base::value_type value_type;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
_BinClos(const _Tp& __t, const valarray<_Tp>& __v) : _Base(__t, __v) {}
|
|
|
|
};
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2003-01-24 17:32:11 +01:00
|
|
|
//
|
|
|
|
// slice_array closure.
|
|
|
|
//
|
2004-07-08 22:48:04 +02:00
|
|
|
template<typename _Dom>
|
|
|
|
class _SBase
|
|
|
|
{
|
2003-01-24 17:32:11 +01:00
|
|
|
public:
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef typename _Dom::value_type value_type;
|
|
|
|
|
|
|
|
_SBase (const _Dom& __e, const slice& __s)
|
|
|
|
: _M_expr (__e), _M_slice (__s) {}
|
|
|
|
|
|
|
|
value_type
|
|
|
|
operator[] (size_t __i) const
|
|
|
|
{ return _M_expr[_M_slice.start () + __i * _M_slice.stride ()]; }
|
|
|
|
|
|
|
|
size_t
|
|
|
|
size() const
|
|
|
|
{ return _M_slice.size (); }
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
private:
|
2004-07-08 22:48:04 +02:00
|
|
|
const _Dom& _M_expr;
|
|
|
|
const slice& _M_slice;
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2004-07-08 22:48:04 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
class _SBase<_Array<_Tp> >
|
|
|
|
{
|
2003-01-24 17:32:11 +01:00
|
|
|
public:
|
2004-07-08 22:48:04 +02:00
|
|
|
typedef _Tp value_type;
|
|
|
|
|
|
|
|
_SBase (_Array<_Tp> __a, const slice& __s)
|
|
|
|
: _M_array (__a._M_data+__s.start()), _M_size (__s.size()),
|
|
|
|
_M_stride (__s.stride()) {}
|
|
|
|
|
|
|
|
value_type
|
|
|
|
operator[] (size_t __i) const
|
|
|
|
{ return _M_array._M_data[__i * _M_stride]; }
|
|
|
|
|
|
|
|
size_t
|
|
|
|
size() const
|
|
|
|
{ return _M_size; }
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
private:
|
2004-07-08 22:48:04 +02:00
|
|
|
const _Array<_Tp> _M_array;
|
|
|
|
const size_t _M_size;
|
|
|
|
const size_t _M_stride;
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2004-07-08 22:48:04 +02:00
|
|
|
template<class _Dom>
|
|
|
|
struct _SClos<_Expr, _Dom>
|
|
|
|
: _SBase<_Dom>
|
|
|
|
{
|
|
|
|
typedef _SBase<_Dom> _Base;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
|
|
|
|
_SClos (const _Dom& __e, const slice& __s) : _Base (__e, __s) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
2004-07-08 22:48:04 +02:00
|
|
|
template<typename _Tp>
|
|
|
|
struct _SClos<_ValArray, _Tp>
|
|
|
|
: _SBase<_Array<_Tp> >
|
|
|
|
{
|
|
|
|
typedef _SBase<_Array<_Tp> > _Base;
|
|
|
|
typedef _Tp value_type;
|
|
|
|
|
|
|
|
_SClos (_Array<_Tp> __a, const slice& __s) : _Base (__a, __s) {}
|
2003-01-24 17:32:11 +01:00
|
|
|
};
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2003-01-24 17:32:11 +01:00
|
|
|
|
|
|
|
#endif /* _CPP_VALARRAY_BEFORE_H */
|