From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 8 Jun 2011 12:12:00 +0000 (+0000)
Subject: extptr_allocator.h: Include <ext/numeric_traits.h> instead of <limits>.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=545dc5e3245fe4abf8c738424d293988e8c67b8c;p=gcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e456f596469..f8601af10ef 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
 	* include/bits/allocator.h (__shrink_to_fit): Simplify.
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index 4fc14105cd3..7067fa09bd4 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -50,7 +50,7 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 #include <bits/ptr_traits.h>
 #include <bits/uses_allocator.h>
-#include <limits>
+#include <ext/numeric_traits.h>
 #endif
 
 namespace std _GLIBCXX_VISIBILITY(default)
@@ -477,7 +477,7 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap,
 	static typename
        	enable_if<!__maxsize_helper<_Alloc2>::value, size_type>::type
 	_S_max_size(_Alloc2&)
-	{ return numeric_limits<size_type>::max(); }
+	{ return __gnu_cxx::__numeric_traits<size_type>::__max; }
 
       template<typename _Alloc2>
 	struct __select_helper
diff --git a/libstdc++-v3/include/ext/extptr_allocator.h b/libstdc++-v3/include/ext/extptr_allocator.h
index c93a7280df6..0119b508e2f 100644
--- a/libstdc++-v3/include/ext/extptr_allocator.h
+++ b/libstdc++-v3/include/ext/extptr_allocator.h
@@ -1,6 +1,6 @@
 // <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
 // software; you can redistribute it and/or modify it under the
@@ -37,7 +37,7 @@
 #define _EXTPTR_ALLOCATOR_H 1
 
 #include <memory>
-#include <limits>
+#include <ext/numeric_traits.h>
 #include <ext/pointer.h>
 
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
@@ -98,7 +98,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       { _M_real_alloc.deallocate(__p.get(), __n); }
 
       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__
       template<typename _Up, typename... _Args>
@@ -111,6 +111,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
         destroy(_Up* __p)
         { __p->~_Up(); }
 #else
+
       void construct(pointer __p, const _Tp& __val)
       { ::new(__p.get()) _Tp(__val); }
 
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index 86e6e0019e1..ed8fc303306 100644
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -203,7 +203,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
 
 	static constexpr _Rep
 	min()
-	{ return numeric_limits<_Rep>::min(); }
+	{ return numeric_limits<_Rep>::lowest(); }
       };
 
     template<typename T>