Add C++11 isms to tr2/dynamic_bitset and tr2/bool_set.
From-SVN: r188967
This commit is contained in:
parent
0aba86007d
commit
9212fcb872
|
@ -1,3 +1,13 @@
|
||||||
|
2012-06-25 Edward Smith-Rowland <3dw4rd@verizon.net>
|
||||||
|
|
||||||
|
* include/tr2/bool_set (count, size, num_blocks, empty, max_size):
|
||||||
|
Add noexcept.
|
||||||
|
|
||||||
|
2012-06-25 Edward Smith-Rowland <3dw4rd@verizon.net>
|
||||||
|
|
||||||
|
* include/tr2/dynamic_bitset (count, size, num_blocks, empty, max_size):
|
||||||
|
Add noexcept.
|
||||||
|
|
||||||
2012-06-25 Benjamin Kosnik <bkoz@redhat.com>
|
2012-06-25 Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
* doc/doxygen/user.cfg.in: Change COMPACT_LATEX to NO.
|
* doc/doxygen/user.cfg.in: Change COMPACT_LATEX to NO.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// TR2 <bool_set> -*- C++ -*-
|
// TR2 <bool_set> -*- C++ -*-
|
||||||
|
|
||||||
// Copyright (C) 2009, 2011 Free Software Foundation, Inc.
|
// Copyright (C) 2009, 2011, 2012 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of the GNU ISO C++ Library. This library is free
|
// 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
|
// software; you can redistribute it and/or modify it under the
|
||||||
|
@ -56,10 +56,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
public:
|
public:
|
||||||
|
|
||||||
/// Default constructor.
|
/// Default constructor.
|
||||||
bool_set() : _M_b(_S_false) { }
|
constexpr bool_set() : _M_b(_S_false) { }
|
||||||
|
|
||||||
/// Constructor from bool.
|
/// Constructor from bool.
|
||||||
bool_set(bool __t) : _M_b(_Bool_set_val(__t)) { }
|
constexpr bool_set(bool __t) : _M_b(_Bool_set_val(__t)) { }
|
||||||
|
|
||||||
// I'm not sure about this.
|
// I'm not sure about this.
|
||||||
bool contains(bool_set __b) const
|
bool contains(bool_set __b) const
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// TR2 <dynamic_bitset> -*- C++ -*-
|
// TR2 <dynamic_bitset> -*- C++ -*-
|
||||||
|
|
||||||
// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
|
// Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
||||||
//
|
//
|
||||||
// This file is part of the GNU ISO C++ Library. This library is free
|
// 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
|
// software; you can redistribute it and/or modify it under the
|
||||||
|
@ -146,19 +146,19 @@ public:
|
||||||
{ return this->_M_w.get_allocator(); }
|
{ return this->_M_w.get_allocator(); }
|
||||||
|
|
||||||
static size_type
|
static size_type
|
||||||
_S_whichword(size_type __pos)
|
_S_whichword(size_type __pos) noexcept
|
||||||
{ return __pos / _S_bits_per_block; }
|
{ return __pos / _S_bits_per_block; }
|
||||||
|
|
||||||
static size_type
|
static size_type
|
||||||
_S_whichbyte(size_type __pos)
|
_S_whichbyte(size_type __pos) noexcept
|
||||||
{ return (__pos % _S_bits_per_block) / __CHAR_BIT__; }
|
{ return (__pos % _S_bits_per_block) / __CHAR_BIT__; }
|
||||||
|
|
||||||
static size_type
|
static size_type
|
||||||
_S_whichbit(size_type __pos)
|
_S_whichbit(size_type __pos) noexcept
|
||||||
{ return __pos % _S_bits_per_block; }
|
{ return __pos % _S_bits_per_block; }
|
||||||
|
|
||||||
static block_type
|
static block_type
|
||||||
_S_maskbit(size_type __pos)
|
_S_maskbit(size_type __pos) noexcept
|
||||||
{ return (static_cast<block_type>(1)) << _S_whichbit(__pos); }
|
{ return (static_cast<block_type>(1)) << _S_whichbit(__pos); }
|
||||||
|
|
||||||
block_type&
|
block_type&
|
||||||
|
@ -333,7 +333,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
size_type
|
size_type
|
||||||
_M_size() const
|
_M_size() const noexcept
|
||||||
{ return this->_M_w.size(); }
|
{ return this->_M_w.size(); }
|
||||||
|
|
||||||
unsigned long
|
unsigned long
|
||||||
|
@ -1141,28 +1141,29 @@ public:
|
||||||
|
|
||||||
/// Returns the number of bits which are set.
|
/// Returns the number of bits which are set.
|
||||||
size_type
|
size_type
|
||||||
count() const
|
count() const noexcept
|
||||||
{ return this->_M_do_count(); }
|
{ return this->_M_do_count(); }
|
||||||
|
|
||||||
/// Returns the total number of bits.
|
/// Returns the total number of bits.
|
||||||
size_type
|
size_type
|
||||||
size() const
|
size() const noexcept
|
||||||
{ return this->_M_Nb; }
|
{ return this->_M_Nb; }
|
||||||
|
|
||||||
/// Returns the total number of blocks.
|
/// Returns the total number of blocks.
|
||||||
size_type num_blocks() const
|
size_type
|
||||||
|
num_blocks() const noexcept
|
||||||
{ return this->_M_size(); }
|
{ return this->_M_size(); }
|
||||||
|
|
||||||
/// Returns true if the dynamic_bitset is empty.
|
/// Returns true if the dynamic_bitset is empty.
|
||||||
bool
|
bool
|
||||||
empty() const
|
empty() const noexcept
|
||||||
{ return (this->_M_Nb == 0); }
|
{ return (this->_M_Nb == 0); }
|
||||||
|
|
||||||
/// Returns the maximum size of a dynamic_bitset object having the same
|
/// Returns the maximum size of a dynamic_bitset object having the same
|
||||||
/// type as *this.
|
/// type as *this.
|
||||||
/// The real answer is max() * bits_per_block but is likely to overflow.
|
/// The real answer is max() * bits_per_block but is likely to overflow.
|
||||||
/*constexpr*/ size_type
|
constexpr size_type
|
||||||
max_size() const
|
max_size() noexcept
|
||||||
{ return std::numeric_limits<block_type>::max(); }
|
{ return std::numeric_limits<block_type>::max(); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue