Skip to content
This repository has been archived by the owner on Sep 28, 2019. It is now read-only.

Commit

Permalink
2003-07-04 Paolo Carlini <pcarlini@unitus.it>
Browse files Browse the repository at this point in the history 
	* include/bits/valarray_array.h: Fully qualify standard
	functions with std::, thus avoiding Koenig lookup.
	* include/bits/vector.tcc: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68927 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
paolo committed Jul 4, 2003
1 parent 9109851 commit 52aa1bf
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 89 deletions.
6 changes: 6 additions & 0 deletions libstdc++-v3/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2003-07-04 Paolo Carlini <pcarlini@unitus.it>

* include/bits/valarray_array.h: Fully qualify standard
functions with std::, thus avoiding Koenig lookup.
* include/bits/vector.tcc: Likewise.

2003-07-04 Benjamin Kosnik <bkoz@redhat.com>

* include/Makefile.am: Update target_ to host_.
Expand Down
32 changes: 16 additions & 16 deletions libstdc++-v3/include/bits/valarray_array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace std
__valarray_get_storage(size_t __n)
{
return static_cast<_Tp*__restrict__>
(__valarray_get_memory(__n * sizeof(_Tp)));
(std::__valarray_get_memory(__n * sizeof(_Tp)));
}

// Return memory to the system
Expand All @@ -87,7 +87,7 @@ namespace std
// For fundamental types, it suffices to say 'memset()'
inline static void
_S_do_it(_Tp* __restrict__ __b, _Tp* __restrict__ __e)
{ memset(__b, 0, (__e - __b)*sizeof(_Tp)); }
{ std::memset(__b, 0, (__e - __b)*sizeof(_Tp)); }
};

template<typename _Tp>
Expand Down Expand Up @@ -149,7 +149,7 @@ namespace std
inline static void
_S_do_it(const _Tp* __restrict__ __b, const _Tp* __restrict__ __e,
_Tp* __restrict__ __o)
{ memcpy(__o, __b, (__e - __b)*sizeof(_Tp)); }
{ std::memcpy(__o, __b, (__e - __b)*sizeof(_Tp)); }
};

template<typename _Tp>
Expand Down Expand Up @@ -231,7 +231,7 @@ namespace std
{
inline static void
_S_do_it(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b)
{ memcpy (__b, __a, __n * sizeof (_Tp)); }
{ std::memcpy (__b, __a, __n * sizeof (_Tp)); }
};

// Copy a plain array __a[<__n>] into a play array __b[<>]
Expand Down Expand Up @@ -379,30 +379,30 @@ namespace std
template<typename _Tp>
inline void
__valarray_fill (_Array<_Tp> __a, size_t __n, const _Tp& __t)
{ __valarray_fill (__a._M_data, __n, __t); }
{ std::__valarray_fill (__a._M_data, __n, __t); }

template<typename _Tp>
inline void
__valarray_fill (_Array<_Tp> __a, size_t __n, size_t __s, const _Tp& __t)
{ __valarray_fill (__a._M_data, __n, __s, __t); }
{ std::__valarray_fill (__a._M_data, __n, __s, __t); }

template<typename _Tp>
inline void
__valarray_fill (_Array<_Tp> __a, _Array<size_t> __i,
size_t __n, const _Tp& __t)
{ __valarray_fill (__a._M_data, __i._M_data, __n, __t); }
{ std::__valarray_fill (__a._M_data, __i._M_data, __n, __t); }

// Copy a plain array __a[<__n>] into a play array __b[<>]
template<typename _Tp>
inline void
__valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b)
{ __valarray_copy(__a._M_data, __n, __b._M_data); }
{ std::__valarray_copy(__a._M_data, __n, __b._M_data); }

// Copy strided array __a[<__n : __s>] in plain __b[<__n>]
template<typename _Tp>
inline void
__valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s, _Array<_Tp> __b)
{ __valarray_copy(__a._M_data, __n, __s, __b._M_data); }
{ std::__valarray_copy(__a._M_data, __n, __s, __b._M_data); }

// Copy a plain array __a[<__n>] into a strided array __b[<__n : __s>]
template<typename _Tp>
Expand All @@ -416,22 +416,22 @@ namespace std
inline void
__valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s1,
_Array<_Tp> __b, size_t __s2)
{ __valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); }
{ std::__valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); }


// Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
template<typename _Tp>
inline void
__valarray_copy(_Array<_Tp> __a, _Array<size_t> __i,
_Array<_Tp> __b, size_t __n)
{ __valarray_copy(__a._M_data, __i._M_data, __b._M_data, __n); }
{ std::__valarray_copy(__a._M_data, __i._M_data, __b._M_data, __n); }

// Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
template<typename _Tp>
inline void
__valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
_Array<size_t> __i)
{ __valarray_copy(__a._M_data, __n, __b._M_data, __i._M_data); }
{ std::__valarray_copy(__a._M_data, __n, __b._M_data, __i._M_data); }

// Copy the __n first elements of an indexed array __src[<__i>] into
// another indexed array __dst[<__j>].
Expand All @@ -440,15 +440,15 @@ namespace std
__valarray_copy(_Array<_Tp> __src, size_t __n, _Array<size_t> __i,
_Array<_Tp> __dst, _Array<size_t> __j)
{
__valarray_copy(__src._M_data, __n, __i._M_data,
__dst._M_data, __j._M_data);
std::__valarray_copy(__src._M_data, __n, __i._M_data,
__dst._M_data, __j._M_data);
}

template<typename _Tp>
inline
_Array<_Tp>::_Array (size_t __n)
: _M_data(__valarray_get_storage<_Tp>(__n))
{ __valarray_default_construct(_M_data, _M_data + __n); }
{ std::__valarray_default_construct(_M_data, _M_data + __n); }

template<typename _Tp>
inline
Expand All @@ -462,7 +462,7 @@ namespace std
inline
_Array<_Tp>::_Array (const _Tp* __restrict__ __b, size_t __s)
: _M_data(__valarray_get_storage<_Tp>(__s))
{ __valarray_copy_construct(__b, __s, _M_data); }
{ std::__valarray_copy_construct(__b, __s, _M_data); }

template<typename _Tp>
inline _Tp*
Expand Down

0 comments on commit 52aa1bf

Please sign in to comment.