OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes] 

2011-10-19  Ed Smith-Rowland  <3dw4rd@verizon.net>

	* include/tr2/bool_set (bool_set): New.
	* include/tr2/bool_set.tcc: New.
	* include/tr2/dynamic_bitset (dynamic_bitset): New.
	* include/tr2/ratio (kibi, mebi, gibi, tebi, pebi, exbi): New.
	* include/Makefile.am: Add files.
	* include/Makefile.in: Regenerate.

2011-10-19  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in: Add tr2 files.
	* testsuite/tr2/headers/all.cc: New.
	* testsuite/tr2/headers/using_namespace_std_tr2.cc: New.

	* include/tr2/type_traits: Tweak.

From-SVN: r180211
This commit is contained in:
Benjamin Kosnik 2011-10-19 22:05:26 +00:00
parent 2c23ebfec6
commit 24ef84f6c3
11 changed files with 2312 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,20 @@
2011-10-19 Ed Smith-Rowland <3dw4rd@verizon.net>
* include/tr2/bool_set (bool_set): New.
* include/tr2/bool_set.tcc: New.
* include/tr2/dynamic_bitset (dynamic_bitset): New.
* include/tr2/ratio (kibi, mebi, gibi, tebi, pebi, exbi): New.
* include/Makefile.am: Add files.
* include/Makefile.in: Regenerate.
2011-10-19 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in: Add tr2 files.
* testsuite/tr2/headers/all.cc: New.
* testsuite/tr2/headers/using_namespace_std_tr2.cc: New.
* include/tr2/type_traits: Tweak.
2011-10-18 Jason Merrill <jason@redhat.com>
PR c++/50500

4
libstdc++-v3/doc/doxygen/user.cfg.in
View File

@ -746,6 +746,10 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \
include/tr1/ctime \
include/tr1/cwchar \
include/tr1/cwctype \
include/tr2/bool_set \
include/tr2/dynamic_bitset \
include/tr2/ratio \
include/tr2/type_traits \
include/decimal/decimal \
include/ext \
include/ext/pb_ds \

108
libstdc++-v3/include/Makefile.am
View File

@ -79,7 +79,7 @@ std_headers = \
bits_srcdir = ${glibcxx_srcdir}/include/bits
bits_builddir = ./bits
bits_headers = \
${bits_srcdir}/algorithmfwd.h \
${bits_srcdir}/algorithmfwd.h \
${bits_srcdir}/alloc_traits.h \
${bits_srcdir}/allocator.h \
${bits_srcdir}/atomic_base.h \
@ -179,11 +179,11 @@ bits_headers = \
bits_sup_srcdir = ${glibcxx_srcdir}/libsupc++
bits_sup_headers = \
${bits_sup_srcdir}/cxxabi_forced.h \
${bits_sup_srcdir}/exception_defines.h \
${bits_sup_srcdir}/exception_ptr.h \
${bits_sup_srcdir}/hash_bytes.h \
${bits_sup_srcdir}/nested_exception.h
${bits_sup_srcdir}/cxxabi_forced.h \
${bits_sup_srcdir}/exception_defines.h \
${bits_sup_srcdir}/exception_ptr.h \
${bits_sup_srcdir}/hash_bytes.h \
${bits_sup_srcdir}/nested_exception.h
backward_srcdir = ${glibcxx_srcdir}/include/backward
backward_builddir = ./backward
@ -269,7 +269,7 @@ pb_headers1 = \
${pb_srcdir}/detail/binomial_heap_/binomial_heap_.hpp \
${pb_srcdir}/detail/binomial_heap_/constructors_destructor_fn_imps.hpp \
${pb_srcdir}/detail/binomial_heap_/debug_fn_imps.hpp \
${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp
${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp
pb_headers2 = \
${pb_srcdir}/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp \
@ -607,6 +607,10 @@ tr1_headers = \
tr2_srcdir = ${glibcxx_srcdir}/include/tr2
tr2_builddir = ./tr2
tr2_headers = \
${tr2_srcdir}/bool_set \
${tr2_srcdir}/bool_set.tcc \
${tr2_srcdir}/dynamic_bitset \
${tr2_srcdir}/ratio \
${tr2_srcdir}/type_traits
decimal_srcdir = ${glibcxx_srcdir}/include/decimal
@ -725,49 +729,49 @@ parallel_srcdir = ${glibcxx_srcdir}/include/parallel
parallel_builddir = ./parallel
if ENABLE_PARALLEL
parallel_headers = \
${parallel_srcdir}/algo.h \
${parallel_srcdir}/algobase.h \
${parallel_srcdir}/algorithm \
${parallel_srcdir}/algorithmfwd.h \
${parallel_srcdir}/balanced_quicksort.h \
${parallel_srcdir}/base.h \
${parallel_srcdir}/basic_iterator.h \
${parallel_srcdir}/checkers.h \
${parallel_srcdir}/compatibility.h \
${parallel_srcdir}/compiletime_settings.h \
${parallel_srcdir}/equally_split.h \
${parallel_srcdir}/features.h \
${parallel_srcdir}/find.h \
${parallel_srcdir}/find_selectors.h \
${parallel_srcdir}/for_each.h \
${parallel_srcdir}/for_each_selectors.h \
${parallel_srcdir}/iterator.h \
${parallel_srcdir}/list_partition.h \
${parallel_srcdir}/losertree.h \
${parallel_srcdir}/merge.h \
${parallel_srcdir}/multiseq_selection.h \
${parallel_srcdir}/multiway_merge.h \
${parallel_srcdir}/multiway_mergesort.h \
${parallel_srcdir}/numeric \
${parallel_srcdir}/numericfwd.h \
${parallel_srcdir}/omp_loop.h \
${parallel_srcdir}/omp_loop_static.h \
${parallel_srcdir}/par_loop.h \
${parallel_srcdir}/parallel.h \
${parallel_srcdir}/partial_sum.h \
${parallel_srcdir}/partition.h \
${parallel_srcdir}/queue.h \
${parallel_srcdir}/quicksort.h \
${parallel_srcdir}/random_number.h \
${parallel_srcdir}/random_shuffle.h \
${parallel_srcdir}/search.h \
${parallel_srcdir}/set_operations.h \
${parallel_srcdir}/settings.h \
${parallel_srcdir}/sort.h \
${parallel_srcdir}/tags.h \
${parallel_srcdir}/types.h \
${parallel_srcdir}/unique_copy.h \
${parallel_srcdir}/workstealing.h
${parallel_srcdir}/algo.h \
${parallel_srcdir}/algobase.h \
${parallel_srcdir}/algorithm \
${parallel_srcdir}/algorithmfwd.h \
${parallel_srcdir}/balanced_quicksort.h \
${parallel_srcdir}/base.h \
${parallel_srcdir}/basic_iterator.h \
${parallel_srcdir}/checkers.h \
${parallel_srcdir}/compatibility.h \
${parallel_srcdir}/compiletime_settings.h \
${parallel_srcdir}/equally_split.h \
${parallel_srcdir}/features.h \
${parallel_srcdir}/find.h \
${parallel_srcdir}/find_selectors.h \
${parallel_srcdir}/for_each.h \
${parallel_srcdir}/for_each_selectors.h \
${parallel_srcdir}/iterator.h \
${parallel_srcdir}/list_partition.h \
${parallel_srcdir}/losertree.h \
${parallel_srcdir}/merge.h \
${parallel_srcdir}/multiseq_selection.h \
${parallel_srcdir}/multiway_merge.h \
${parallel_srcdir}/multiway_mergesort.h \
${parallel_srcdir}/numeric \
${parallel_srcdir}/numericfwd.h \
${parallel_srcdir}/omp_loop.h \
${parallel_srcdir}/omp_loop_static.h \
${parallel_srcdir}/par_loop.h \
${parallel_srcdir}/parallel.h \
${parallel_srcdir}/partial_sum.h \
${parallel_srcdir}/partition.h \
${parallel_srcdir}/queue.h \
${parallel_srcdir}/quicksort.h \
${parallel_srcdir}/random_number.h \
${parallel_srcdir}/random_shuffle.h \
${parallel_srcdir}/search.h \
${parallel_srcdir}/set_operations.h \
${parallel_srcdir}/settings.h \
${parallel_srcdir}/sort.h \
${parallel_srcdir}/tags.h \
${parallel_srcdir}/types.h \
${parallel_srcdir}/unique_copy.h \
${parallel_srcdir}/workstealing.h
else
parallel_headers =
endif
@ -894,7 +898,7 @@ allstamped = \
stamp-std stamp-bits stamp-bits-sup stamp-c_base stamp-c_compatibility \
stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr2 stamp-decimal \
stamp-debug stamp-parallel stamp-profile stamp-profile-impl \
stamp-host
stamp-host
# List of all files that are created by explicit building, editing, or
# catenation.
@ -1104,7 +1108,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \
-e "s,define _GLIBCXX_EXTERN_TEMPLATE, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
-e "$$ldbl_compat" \
< ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
< ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
-e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
-e 's/VERSION/_GLIBCXX_VERSION/g' \

108
libstdc++-v3/include/Makefile.in
View File

@ -331,7 +331,7 @@ std_headers = \
bits_srcdir = ${glibcxx_srcdir}/include/bits
bits_builddir = ./bits
bits_headers = \
${bits_srcdir}/algorithmfwd.h \
${bits_srcdir}/algorithmfwd.h \
${bits_srcdir}/alloc_traits.h \
${bits_srcdir}/allocator.h \
${bits_srcdir}/atomic_base.h \
@ -431,11 +431,11 @@ bits_headers = \
bits_sup_srcdir = ${glibcxx_srcdir}/libsupc++
bits_sup_headers = \
${bits_sup_srcdir}/cxxabi_forced.h \
${bits_sup_srcdir}/exception_defines.h \
${bits_sup_srcdir}/exception_ptr.h \
${bits_sup_srcdir}/hash_bytes.h \
${bits_sup_srcdir}/nested_exception.h
${bits_sup_srcdir}/cxxabi_forced.h \
${bits_sup_srcdir}/exception_defines.h \
${bits_sup_srcdir}/exception_ptr.h \
${bits_sup_srcdir}/hash_bytes.h \
${bits_sup_srcdir}/nested_exception.h
backward_srcdir = ${glibcxx_srcdir}/include/backward
backward_builddir = ./backward
@ -520,7 +520,7 @@ pb_headers1 = \
${pb_srcdir}/detail/binomial_heap_/binomial_heap_.hpp \
${pb_srcdir}/detail/binomial_heap_/constructors_destructor_fn_imps.hpp \
${pb_srcdir}/detail/binomial_heap_/debug_fn_imps.hpp \
${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp
${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp
pb_headers2 = \
${pb_srcdir}/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp \
@ -857,6 +857,10 @@ tr1_headers = \
tr2_srcdir = ${glibcxx_srcdir}/include/tr2
tr2_builddir = ./tr2
tr2_headers = \
${tr2_srcdir}/bool_set \
${tr2_srcdir}/bool_set.tcc \
${tr2_srcdir}/dynamic_bitset \
${tr2_srcdir}/ratio \
${tr2_srcdir}/type_traits
decimal_srcdir = ${glibcxx_srcdir}/include/decimal
@ -971,49 +975,49 @@ parallel_srcdir = ${glibcxx_srcdir}/include/parallel
parallel_builddir = ./parallel
@ENABLE_PARALLEL_FALSE@parallel_headers =
@ENABLE_PARALLEL_TRUE@parallel_headers = \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algo.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithmfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/balanced_quicksort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/base.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/basic_iterator.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/checkers.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compatibility.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compiletime_settings.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/equally_split.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/features.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find_selectors.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each_selectors.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/iterator.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/list_partition.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/losertree.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/merge.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiseq_selection.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_merge.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_mergesort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numeric \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numericfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop_static.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/par_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partial_sum.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partition.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/queue.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/quicksort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_number.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_shuffle.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/search.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/set_operations.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/settings.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/sort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/tags.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/types.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/unique_copy.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algo.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithmfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/balanced_quicksort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/base.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/basic_iterator.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/checkers.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compatibility.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compiletime_settings.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/equally_split.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/features.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find_selectors.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each_selectors.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/iterator.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/list_partition.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/losertree.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/merge.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiseq_selection.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_merge.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_mergesort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numeric \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numericfwd.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop_static.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/par_loop.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partial_sum.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partition.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/queue.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/quicksort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_number.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_shuffle.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/search.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/set_operations.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/settings.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/sort.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/tags.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/types.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/unique_copy.h \
@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h
# Profile mode headers
@ -1132,7 +1136,7 @@ allstamped = \
stamp-std stamp-bits stamp-bits-sup stamp-c_base stamp-c_compatibility \
stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr2 stamp-decimal \
stamp-debug stamp-parallel stamp-profile stamp-profile-impl \
stamp-host
stamp-host
# List of all files that are created by explicit building, editing, or
@ -1495,7 +1499,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \
-e "s,define _GLIBCXX_EXTERN_TEMPLATE, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
-e "$$ldbl_compat" \
< ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
< ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
-e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
-e 's/VERSION/_GLIBCXX_VERSION/g' \

320
libstdc++-v3/include/tr2/bool_set Normal file
View File

@ -0,0 +1,320 @@
// TR2 <bool_set> -*- C++ -*-
// Copyright (C) 2009, 2011 Free Software Foundation, Inc.
//
// 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
// Free Software Foundation; either version 3, or (at your option)
// 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.
// 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/>.
/** @file tr2/bool_set
* This is a TR2 C++ Library header.
*/
//
// Sort of an implementation of bool_set in n2136 Hervé Brönnimann,
// Guillaume Melquiond, Sylvain Pion.
//
// The implicit conversion to bool is slippery! I may use the new
// explicit conversion. This has been specialized in the language so
// that in contexts requiring a bool the conversion happens
// implicitly. Thus most objections should be eliminated.
//
#ifndef _GLIBCXX_TR2_BOOL_SET
#define _GLIBCXX_TR2_BOOL_SET 1
#pragma GCC system_header
#include <typeinfo>
#include <iostream>
namespace std _GLIBCXX_VISIBILITY(default)
{
namespace tr2
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
class bool_set
{
public:
/// Default constructor.
bool_set() : _M_b(_S_false) { }
/// Constructor from bool.
bool_set(bool __t) : _M_b(_Bool_set_val(__t)) { }
///
// I'm not sure about this.
bool contains(bool_set __b) const
{ return this->is_singleton() && this->equals(__b); }
/// Return true if states are equal.
bool equals(bool_set __b) const
{ return __b._M_b == _M_b; }
/// Return true if this is empty.
bool is_emptyset() const
{ return _M_b == _S_empty; }
/// Return true if this is indeterminate.
bool is_indeterminate() const
{ return _M_b == _S_indet; }
/// Return true if this is false or true (normal boolean).
bool is_singleton() const
{ return _M_b == _S_false || _M_b == _S_true_; }
/// Conversion to bool.
//explicit
operator bool() const
{
if (! is_singleton())
throw std::bad_cast();
return _M_b;
}
///
static bool_set indeterminate()
{
bool_set __b;
__b._M_b = _S_indet;
return __b;
}
///
static bool_set emptyset()
{
bool_set __b;
__b._M_b = _S_empty;
return __b;
}
friend bool_set
operator!(bool_set __b)
{ return __b._M_not(); }
friend bool_set
operator^(bool_set __s, bool_set __t)
{ return __s._M_xor(__t); }
friend bool_set
operator|(bool_set __s, bool_set __t)
{ return __s._M_or(__t); }
friend bool_set
operator&(bool_set __s, bool_set __t)
{ return __s._M_and(__t); }
friend bool_set
operator==(bool_set __s, bool_set __t)
{ return __s._M_eq(__t); }
// These overloads replace the facet additions in the paper!
template<typename CharT, typename Traits>
friend std::basic_ostream<CharT, Traits>&
operator<<(std::basic_ostream<CharT, Traits>& __out, bool_set __b)
{
int __a = __b._M_b;
__out << __a;
}
template<typename CharT, typename Traits>
friend std::basic_istream<CharT, Traits>&
operator>>(std::basic_istream<CharT, Traits>& __in, bool_set& __b)
{
long __c;
__in >> __c;
if (__c >= _S_false && __c < _S_empty)
__b._M_b = static_cast<_Bool_set_val>(__c);
}
private:
///
enum _Bool_set_val: unsigned char
{
_S_false = 0,
_S_true_ = 1,
_S_indet = 2,
_S_empty = 3
};
/// Bool set state.
_Bool_set_val _M_b;
///
bool_set(_Bool_set_val __c) : _M_b(__c) { }
///
bool_set _M_not() const
{ return _S_not[this->_M_b]; }
///
bool_set _M_xor(bool_set __b) const
{ return _S_xor[this->_M_b][__b._M_b]; }
///
bool_set _M_or(bool_set __b) const
{ return _S_or[this->_M_b][__b._M_b]; }
///
bool_set _M_and(bool_set __b) const
{ return _S_and[this->_M_b][__b._M_b]; }
///
bool_set _M_eq(bool_set __b) const
{ return _S_eq[this->_M_b][__b._M_b]; }
///
static _Bool_set_val _S_not[4];
///
static _Bool_set_val _S_xor[4][4];
///
static _Bool_set_val _S_or[4][4];
///
static _Bool_set_val _S_and[4][4];
///
static _Bool_set_val _S_eq[4][4];
};
// 20.2.3.2 bool_set values
inline bool
contains(bool_set __s, bool_set __t)
{ return __s.contains(__t); }
inline bool
equals(bool_set __s, bool_set __t)
{ return __s.equals(__t); }
inline bool
is_emptyset(bool_set __b)
{ return __b.is_emptyset(); }
inline bool
is_indeterminate(bool_set __b)
{ return __b.is_indeterminate(); }
inline bool
is_singleton(bool_set __b)
{ return __b.is_singleton(); }
inline bool
certainly(bool_set __b)
{ return ! __b.contains(false); }
inline bool
possibly(bool_set __b)
{ return __b.contains(true); }
// 20.2.3.3 bool_set set operations
inline bool_set
set_union(bool __s, bool_set __t)
{ return bool_set(__s) | __t; }
inline bool_set
set_union(bool_set __s, bool __t)
{ return __s | bool_set(__t); }
inline bool_set
set_union(bool_set __s, bool_set __t)
{ return __s | __t; }
inline bool_set
set_intersection(bool __s, bool_set __t)
{ return bool_set(__s) & __t; }
inline bool_set
set_intersection(bool_set __s, bool __t)
{ return __s & bool_set(__t); }
inline bool_set
set_intersection(bool_set __s, bool_set __t)
{ return __s & __t; }
inline bool_set
set_complement(bool_set __b)
{ return ! __b; }
// 20.2.3.4 bool_set logical operators
inline bool_set
operator^(bool __s, bool_set __t)
{ return bool_set(__s) ^ __t; }
inline bool_set
operator^(bool_set __s, bool __t)
{ return __s ^ bool_set(__t); }
inline bool_set
operator|(bool __s, bool_set __t)
{ return bool_set(__s) | __t; }
inline bool_set
operator|(bool_set __s, bool __t)
{ return __s | bool_set(__t); }
inline bool_set
operator&(bool __s, bool_set __t)
{ return bool_set(__s) & __t; }
inline bool_set
operator&(bool_set __s, bool __t)
{ return __s & bool_set(__t); }
// 20.2.3.5 bool_set relational operators
inline bool_set
operator==(bool __s, bool_set __t)
{ return bool_set(__s) == __t; }
inline bool_set
operator==(bool_set __s, bool __t)
{ return __s == bool_set(__t); }
inline bool_set
operator!=(bool __s, bool_set __t)
{ return ! (__s == __t); }
inline bool_set
operator!=(bool_set __s, bool __t)
{ return ! (__s == __t); }
inline bool_set
operator!=(bool_set __s, bool_set __t)
{ return ! (__s == __t); }
_GLIBCXX_END_NAMESPACE_VERSION
}
}
#include <tr2/bool_set.tcc>
#endif // _GLIBCXX_TR2_BOOL_SET

277
libstdc++-v3/include/tr2/bool_set.tcc Normal file
View File

@ -0,0 +1,277 @@
// TR2 <bool_set> support files -*- C++ -*-
// Copyright (C) 2009, 2011 Free Software Foundation, Inc.
//
// 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
// Free Software Foundation; either version 3, or (at your option)
// 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.
// 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/>.
/** @file tr2/bool_set.tcc
* This is a TR2 C++ Library header.
*/
#ifndef _GLIBCXX_TR2_BOOL_SET_TCC
#define _GLIBCXX_TR2_BOOL_SET_TCC 1
#pragma GCC system_header
namespace std _GLIBCXX_VISIBILITY(default)
{
namespace tr2
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
bool_set::_Bool_set_val
bool_set::_S_not[4] =
{ _S_true_, _S_false, _S_indet, _S_empty };
bool_set::_Bool_set_val
bool_set::_S_xor[4][4] =
{ { _S_false, _S_true_, _S_indet, _S_empty },
{ _S_true_, _S_false, _S_indet, _S_empty },
{ _S_indet, _S_indet, _S_indet, _S_empty },
{ _S_empty, _S_empty, _S_empty, _S_empty } };
bool_set::_Bool_set_val
bool_set::_S_or[4][4] =
{ { _S_false, _S_true_, _S_indet, _S_empty },
{ _S_true_, _S_true_, _S_true_, _S_empty },
{ _S_indet, _S_true_, _S_indet, _S_empty },
{ _S_empty, _S_empty, _S_empty, _S_empty } };
bool_set::_Bool_set_val
bool_set::_S_and[4][4] =
{ { _S_false, _S_false, _S_false, _S_empty },
{ _S_false, _S_true_, _S_indet, _S_empty },
{ _S_false, _S_indet, _S_indet, _S_empty },
{ _S_empty, _S_empty, _S_empty, _S_empty } };
bool_set::_Bool_set_val
bool_set::_S_eq[4][4] =
{ { _S_true_, _S_false, _S_indet, _S_empty },
{ _S_false, _S_true_, _S_indet, _S_empty },
{ _S_indet, _S_indet, _S_indet, _S_empty },
{ _S_empty, _S_empty, _S_empty, _S_empty } };
_GLIBCXX_END_NAMESPACE_VERSION
}
}
// I object to these things.
// The stuff in locale facets are for basic types.
// I think we could hack operator<< and operator>>.
/**
* @brief Numeric parsing.
*
* Parses the input stream into the bool @a v. It does so by calling
* num_get::do_get().
*
* If ios_base::boolalpha is set, attempts to read
* ctype<CharT>::truename() or ctype<CharT>::falsename(). Sets
* @a v to true or false if successful. Sets err to
* ios_base::failbit if reading the string fails. Sets err to
* ios_base::eofbit if the stream is emptied.
*
* If ios_base::boolalpha is not set, proceeds as with reading a long,
* except if the value is 1, sets @a v to true, if the value is 0, sets
* @a v to false, and otherwise set err to ios_base::failbit.
*
* @param in Start of input stream.
* @param end End of input stream.
* @param io Source of locale and flags.
* @param err Error flags to set.
* @param v Value to format and insert.
* @return Iterator after reading.
iter_type
get(iter_type __in, iter_type __end, ios_base& __io,
ios_base::iostate& __err, bool& __v) const
{ return this->do_get(__in, __end, __io, __err, __v); }
*/
/*
template<typename _CharT, typename _InIter>
_InIter
num_get<_CharT, _InIter>::
do_get(iter_type __beg, iter_type __end, ios_base& __io,
ios_base::iostate& __err, bool_set& __v) const
{
if (!(__io.flags() & ios_base::boolalpha))
{
// Parse bool values as long.
// NB: We can't just call do_get(long) here, as it might
// refer to a derived class.
long __l = -1;
__beg = _M_extract_int(__beg, __end, __io, __err, __l);
if (__c >= _S_false && __c < _S_empty)
__b._M_b = static_cast<_Bool_set_val>(__c);
else
{
// What should we do here?
__v = true;
__err = ios_base::failbit;
if (__beg == __end)
__err |= ios_base::eofbit;
}
}
else
{
// Parse bool values as alphanumeric.
typedef __numpunct_cache<_CharT> __cache_type;
__use_cache<__cache_type> __uc;
const locale& __loc = __io._M_getloc();
const __cache_type* __lc = __uc(__loc);
bool __testf = true;
bool __testt = true;
bool __donef = __lc->_M_falsename_size == 0;
bool __donet = __lc->_M_truename_size == 0;
bool __testeof = false;
size_t __n = 0;
while (!__donef || !__donet)
{
if (__beg == __end)
{
__testeof = true;
break;
}
const char_type __c = *__beg;
if (!__donef)
__testf = __c == __lc->_M_falsename[__n];
if (!__testf && __donet)
break;
if (!__donet)
__testt = __c == __lc->_M_truename[__n];
if (!__testt && __donef)
break;
if (!__testt && !__testf)
break;
++__n;
++__beg;
__donef = !__testf || __n >= __lc->_M_falsename_size;
__donet = !__testt || __n >= __lc->_M_truename_size;
}
if (__testf && __n == __lc->_M_falsename_size && __n)
{
__v = false;
if (__testt && __n == __lc->_M_truename_size)
__err = ios_base::failbit;
else
__err = __testeof ? ios_base::eofbit : ios_base::goodbit;
}
else if (__testt && __n == __lc->_M_truename_size && __n)
{
__v = true;
__err = __testeof ? ios_base::eofbit : ios_base::goodbit;
}
else
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 23. Num_get overflow result.
__v = false;
__err = ios_base::failbit;
if (__testeof)
__err |= ios_base::eofbit;
}
}
return __beg;
}
*/
/**
* @brief Numeric formatting.
*
* Formats the boolean @a v and inserts it into a stream. It does so
* by calling num_put::do_put().
*
* If ios_base::boolalpha is set, writes ctype<CharT>::truename() or
* ctype<CharT>::falsename(). Otherwise formats @a v as an int.
*
* @param s Stream to write to.
* @param io Source of locale and flags.
* @param fill Char_type to use for filling.
* @param v Value to format and insert.
* @return Iterator after writing.
iter_type
put(iter_type __s, ios_base& __f, char_type __fill, bool __v) const
{ return this->do_put(__s, __f, __fill, __v); }
*/
/*
template<typename _CharT, typename _OutIter>
_OutIter
num_put<_CharT, _OutIter>::
do_put(iter_type __s, ios_base& __io, char_type __fill, bool_set __v) const
{
const ios_base::fmtflags __flags = __io.flags();
if ((__flags & ios_base::boolalpha) == 0)
{
const long __l = __v;
__s = _M_insert_int(__s, __io, __fill, __l);
}
else
{
typedef __numpunct_cache<_CharT> __cache_type;
__use_cache<__cache_type> __uc;
const locale& __loc = __io._M_getloc();
const __cache_type* __lc = __uc(__loc);
const _CharT* __name = __v ? __lc->_M_truename
: __lc->_M_falsename;
int __len = __v ? __lc->_M_truename_size
: __lc->_M_falsename_size;
const streamsize __w = __io.width();
if (__w > static_cast<streamsize>(__len))
{
const streamsize __plen = __w - __len;
_CharT* __ps
= static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
* __plen));
char_traits<_CharT>::assign(__ps, __plen, __fill);
__io.width(0);
if ((__flags & ios_base::adjustfield) == ios_base::left)
{
__s = std::__write(__s, __name, __len);
__s = std::__write(__s, __ps, __plen);
}
else
{
__s = std::__write(__s, __ps, __plen);
__s = std::__write(__s, __name, __len);
}
return __s;
}
__io.width(0);
__s = std::__write(__s, __name, __len);
}
return __s;
}
*/
#endif // _GLIBCXX_TR2_BOOL_SET_TCC

1472
libstdc++-v3/include/tr2/dynamic_bitset Normal file
View File

File diff suppressed because it is too large Load Diff

59
libstdc++-v3/include/tr2/ratio Normal file
View File

@ -0,0 +1,59 @@
// TR2 <ratio> -*- C++ -*-
// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
//
// 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
// Free Software Foundation; either version 3, or (at your option)
// 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.
// 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/>.
/** @file tr2/ratio
* This is a TR2 C++ Library header.
*/
#include <ratio>
namespace std _GLIBCXX_VISIBILITY(default)
{
namespace tr2
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<intmax_t _Pn, size_t _Bit,
bool = _Bit < static_cast<size_t>
(std::numeric_limits<intmax_t>::digits)>
struct __safe_lshift
{ static const intmax_t __value = 0; };
template<intmax_t _Pn, size_t _Bit>
struct __safe_lshift<_Pn, _Bit, true>
{ static const intmax_t __value = _Pn << _Bit; };
/// Add binary prefixes (IEC 60027-2 A.2 and ISO/IEC 80000).
typedef ratio<__safe_lshift<1, 10>::__value, 1> kibi;
typedef ratio<__safe_lshift<1, 20>::__value, 1> mebi;
typedef ratio<__safe_lshift<1, 30>::__value, 1> gibi;
typedef ratio<__safe_lshift<1, 40>::__value, 1> tebi;
typedef ratio<__safe_lshift<1, 50>::__value, 1> pebi;
typedef ratio<__safe_lshift<1, 60>::__value, 1> exbi;
//typedef ratio<__safe_lshift<1, 70>::__value, 1> zebi;
//typedef ratio<__safe_lshift<1, 80>::__value, 1> yobi;
_GLIBCXX_END_NAMESPACE_VERSION
}
}

2
libstdc++-v3/include/tr2/type_traits
View File

@ -1,4 +1,4 @@
// TR2 type_traits -*- C++ -*-
// TR2 <type_traits> -*- C++ -*-
// Copyright (C) 2011 Free Software Foundation, Inc.
//

24
libstdc++-v3/testsuite/tr2/headers/all.cc Normal file
View File

@ -0,0 +1,24 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
// Copyright (C) 2011 Free Software Foundation, Inc.
//
// 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
// Free Software Foundation; either version 3, or (at your option)
// 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.
//
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <tr2/type_traits>
#include <tr2/dynamic_bitset>
#include <tr2/bool_set>
#include <tr2/ratio>

26
libstdc++-v3/testsuite/tr2/headers/using_namespace_std_tr2.cc Normal file
View File

@ -0,0 +1,26 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
// Copyright (C) 2011 Free Software Foundation, Inc.
//
// 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
// Free Software Foundation; either version 3, or (at your option)
// 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.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <tr2/type_traits>
namespace gnu
{
using namespace std::tr2;
}