git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extptr_allocator.h: Include <ext/numeric_traits.h> instead of <limits>. 

2011-06-08  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/ext/extptr_allocator.h: Include <ext/numeric_traits.h>
	instead of <limits>.
	* include/bits/allocator.h: Likewise.

	* include/std/chrono (duration_values<>::min): Call lowest, not min.

From-SVN: r174805
This commit is contained in:
Paolo Carlini 2011-06-08 12:12:00 +00:00 committed by Paolo Carlini
parent d02c23af12
commit 545dc5e324
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2011-06-08 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/extptr_allocator.h: Include <ext/numeric_traits.h>
instead of <limits>.
* include/bits/allocator.h: Likewise.
* include/std/chrono (duration_values<>::min): Call lowest, not min.
2011-06-08 Paolo Carlini <paolo.carlini@oracle.com> 2011-06-08 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/allocator.h (__shrink_to_fit): Simplify. * include/bits/allocator.h (__shrink_to_fit): Simplify.

4
libstdc++-v3/include/bits/allocator.h
View File

@ -50,7 +50,7 @@
#ifdef __GXX_EXPERIMENTAL_CXX0X__ #ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <bits/ptr_traits.h> #include <bits/ptr_traits.h>
#include <bits/uses_allocator.h> #include <bits/uses_allocator.h>
#include <limits> #include <ext/numeric_traits.h>
#endif #endif
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
@ -477,7 +477,7 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
static typename static typename
enable_if<!__maxsize_helper<_Alloc2>::value, size_type>::type enable_if<!__maxsize_helper<_Alloc2>::value, size_type>::type
_S_max_size(_Alloc2&) _S_max_size(_Alloc2&)
{ return numeric_limits<size_type>::max(); } { return __gnu_cxx::__numeric_traits<size_type>::__max; }
template<typename _Alloc2> template<typename _Alloc2>
struct __select_helper struct __select_helper

7
libstdc++-v3/include/ext/extptr_allocator.h
View File

@ -1,6 +1,6 @@
// <extptr_allocator.h> -*- C++ -*- // <extptr_allocator.h> -*- C++ -*-
// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. // Copyright (C) 2008, 2009, 2010, 2011 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
@ -37,7 +37,7 @@
#define _EXTPTR_ALLOCATOR_H 1 #define _EXTPTR_ALLOCATOR_H 1
#include <memory> #include <memory>
#include <limits> #include <ext/numeric_traits.h>
#include <ext/pointer.h> #include <ext/pointer.h>
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
@ -98,7 +98,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ _M_real_alloc.deallocate(__p.get(), __n); } { _M_real_alloc.deallocate(__p.get(), __n); }
size_type max_size() const throw() size_type max_size() const throw()
{ return std::numeric_limits<size_type>::max() / sizeof(_Tp); } { return __numeric_traits<size_type>::__max / sizeof(_Tp); }
#ifdef __GXX_EXPERIMENTAL_CXX0X__ #ifdef __GXX_EXPERIMENTAL_CXX0X__
template<typename _Up, typename... _Args> template<typename _Up, typename... _Args>
@ -111,6 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
destroy(_Up* __p) destroy(_Up* __p)
{ __p->~_Up(); } { __p->~_Up(); }
#else #else
void construct(pointer __p, const _Tp& __val) void construct(pointer __p, const _Tp& __val)
{ ::new(__p.get()) _Tp(__val); } { ::new(__p.get()) _Tp(__val); }

2
libstdc++-v3/include/std/chrono
View File

@ -203,7 +203,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
static constexpr _Rep static constexpr _Rep
min() min()
{ return numeric_limits<_Rep>::min(); } { return numeric_limits<_Rep>::lowest(); }
}; };
template<typename T> template<typename T>