Commit b714a419 by Paolo Carlini Committed by Paolo Carlini

gslice.h: Trivial formatting fixes.

2004-07-08  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/gslice.h: Trivial formatting fixes.
	* include/bits/gslice_array.h: Likewise.
	* include/bits/indirect_array.h: Likewise.
	* include/bits/mask_array.h: Likewise.
	* include/bits/slice_array.h: Likewise.
	* include/bits/valarray_after.h: Likewise.
	* include/bits/valarray_array.h: Likewise.
	* include/bits/valarray_before.h: Likewise.
	* include/std/std_valarray.h: Likewise.

From-SVN: r84312
parent d222b827
2004-07-08 Paolo Carlini <pcarlini@suse.de>
* include/bits/gslice.h: Trivial formatting fixes.
* include/bits/gslice_array.h: Likewise.
* include/bits/indirect_array.h: Likewise.
* include/bits/mask_array.h: Likewise.
* include/bits/slice_array.h: Likewise.
* include/bits/valarray_after.h: Likewise.
* include/bits/valarray_array.h: Likewise.
* include/bits/valarray_before.h: Likewise.
* include/std/std_valarray.h: Likewise.
2004-07-08 Benjamin Kosnik <bkoz@redhat.com> 2004-07-08 Benjamin Kosnik <bkoz@redhat.com>
PR c++/16169 PR c++/16169
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#pragma GCC system_header #pragma GCC system_header
namespace std { namespace std
{
/** /**
* @brief Class defining multi-dimensional subset of an array. * @brief Class defining multi-dimensional subset of an array.
* *
...@@ -101,7 +101,8 @@ namespace std { ...@@ -101,7 +101,8 @@ namespace std {
valarray<size_t> stride() const; valarray<size_t> stride() const;
private: private:
struct _Indexer { struct _Indexer
{
size_t _M_count; size_t _M_count;
size_t _M_start; size_t _M_start;
valarray<size_t> _M_size; valarray<size_t> _M_size;
...@@ -109,8 +110,13 @@ namespace std { ...@@ -109,8 +110,13 @@ namespace std {
valarray<size_t> _M_index; // Linear array of referenced indices valarray<size_t> _M_index; // Linear array of referenced indices
_Indexer(size_t, const valarray<size_t>&, _Indexer(size_t, const valarray<size_t>&,
const valarray<size_t>&); const valarray<size_t>&);
void _M_increment_use() { ++_M_count; } void
size_t _M_decrement_use() { return --_M_count; } _M_increment_use()
{ ++_M_count; }
size_t
_M_decrement_use()
{ return --_M_count; }
}; };
_Indexer* _M_index; _Indexer* _M_index;
...@@ -143,21 +149,24 @@ namespace std { ...@@ -143,21 +149,24 @@ namespace std {
inline inline
gslice::~gslice() gslice::~gslice()
{ if (_M_index && _M_index->_M_decrement_use() == 0) delete _M_index; } {
if (_M_index && _M_index->_M_decrement_use() == 0)
delete _M_index;
}
inline gslice& inline gslice&
gslice::operator= (const gslice& __g) gslice::operator= (const gslice& __g)
{ {
if (__g._M_index) __g._M_index->_M_increment_use(); if (__g._M_index)
if (_M_index && _M_index->_M_decrement_use() == 0) delete _M_index; __g._M_index->_M_increment_use();
if (_M_index && _M_index->_M_decrement_use() == 0)
delete _M_index;
_M_index = __g._M_index; _M_index = __g._M_index;
return *this; return *this;
} }
} // std:: } // std::
#endif /* _GSLICE_H */ #endif /* _GSLICE_H */
// Local Variables: // Local Variables:
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#pragma GCC system_header #pragma GCC system_header
namespace std { namespace std
{
/** /**
* @brief Reference to multi-dimensional subset of an array. * @brief Reference to multi-dimensional subset of an array.
* *
...@@ -97,27 +97,27 @@ namespace std { ...@@ -97,27 +97,27 @@ namespace std {
void operator=(const _Tp&) const; void operator=(const _Tp&) const;
template<class _Dom> template<class _Dom>
void operator=(const _Expr<_Dom,_Tp>&) const; void operator=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator*=(const _Expr<_Dom,_Tp>&) const; void operator*=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator/=(const _Expr<_Dom,_Tp>&) const; void operator/=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator%=(const _Expr<_Dom,_Tp>&) const; void operator%=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator+=(const _Expr<_Dom,_Tp>&) const; void operator+=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator-=(const _Expr<_Dom,_Tp>&) const; void operator-=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator^=(const _Expr<_Dom,_Tp>&) const; void operator^=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator&=(const _Expr<_Dom,_Tp>&) const; void operator&=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator|=(const _Expr<_Dom,_Tp>&) const; void operator|=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator<<=(const _Expr<_Dom,_Tp>&) const; void operator<<=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator>>=(const _Expr<_Dom,_Tp>&) const; void operator>>=(const _Expr<_Dom, _Tp>&) const;
private: private:
_Array<_Tp> _M_array; _Array<_Tp> _M_array;
...@@ -137,13 +137,11 @@ namespace std { ...@@ -137,13 +137,11 @@ namespace std {
const valarray<size_t>& __i) const valarray<size_t>& __i)
: _M_array(__a), _M_index(__i) {} : _M_array(__a), _M_index(__i) {}
template<typename _Tp> template<typename _Tp>
inline inline
gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a) gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a)
: _M_array(__a._M_array), _M_index(__a._M_index) {} : _M_array(__a._M_array), _M_index(__a._M_index) {}
template<typename _Tp> template<typename _Tp>
inline gslice_array<_Tp>& inline gslice_array<_Tp>&
gslice_array<_Tp>::operator=(const gslice_array<_Tp>& __a) gslice_array<_Tp>::operator=(const gslice_array<_Tp>& __a)
......
...@@ -156,7 +156,6 @@ namespace std ...@@ -156,7 +156,6 @@ namespace std
return *this; return *this;
} }
template<typename _Tp> template<typename _Tp>
inline void inline void
indirect_array<_Tp>::operator=(const _Tp& __t) const indirect_array<_Tp>::operator=(const _Tp& __t) const
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#pragma GCC system_header #pragma GCC system_header
namespace std { namespace std
{
/** /**
* @brief Reference to selected subset of an array. * @brief Reference to selected subset of an array.
* *
...@@ -134,7 +134,6 @@ namespace std { ...@@ -134,7 +134,6 @@ namespace std {
mask_array(); mask_array();
}; };
template<typename _Tp> template<typename _Tp>
inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a) inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a)
: _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {} : _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {}
......
...@@ -160,27 +160,27 @@ namespace std ...@@ -160,27 +160,27 @@ namespace std
// ~slice_array (); // ~slice_array ();
template<class _Dom> template<class _Dom>
void operator=(const _Expr<_Dom,_Tp>&) const; void operator=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator*=(const _Expr<_Dom,_Tp>&) const; void operator*=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator/=(const _Expr<_Dom,_Tp>&) const; void operator/=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator%=(const _Expr<_Dom,_Tp>&) const; void operator%=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator+=(const _Expr<_Dom,_Tp>&) const; void operator+=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator-=(const _Expr<_Dom,_Tp>&) const; void operator-=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator^=(const _Expr<_Dom,_Tp>&) const; void operator^=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator&=(const _Expr<_Dom,_Tp>&) const; void operator&=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator|=(const _Expr<_Dom,_Tp>&) const; void operator|=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator<<=(const _Expr<_Dom,_Tp>&) const; void operator<<=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator>>=(const _Expr<_Dom,_Tp>&) const; void operator>>=(const _Expr<_Dom, _Tp>&) const;
private: private:
friend class valarray<_Tp>; friend class valarray<_Tp>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment