This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[Patch] Split-out __numeric_traits from ext/type_traits.h
- From: Paolo Carlini <pcarlini at suse dot de>
- To: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Thu, 05 Apr 2007 16:07:04 +0200
- Subject: [Patch] Split-out __numeric_traits from ext/type_traits.h
Hi,
I'd like to do this change, which avoids including all the stuff
currently in ext/type_traits.h (+ <limits>) where only the older bits
are needed (e.g., __enable_if, __add_unsigned): that means most of the
headers, a couple of places in pb_ds and tr1/random excluded. The size
of preprocessed <cmath>, for example, is cut almost to half.
I would also apply it to 4_2-branch, it's safe because we never
delivered ext/type_traits.h before, because it fixes libstdc++/31481
(but I would never apply it only because of that ;)
Paolo.
/////////////////
2007-04-05 Paolo Carlini <pcarlini@suse.de>
* include/ext/type_traits.h (__numeric_traits): Move...
* include/ext/numeric_limits.h: ... here, as __numeric_limits.
* include/Makefile.am: Add.
* include/ext/pb_ds/detail/type_utils.hpp: Adjust.
* include/ext/pb_ds/trie_policy.hpp: Likewise.
* include/tr1/random.tcc: Likewise.
* include/tr1/random: Include <ext/numeric_limits.h> too.
* testsuite/ext/type_traits/numeric_traits.cc: Move...
* testsuite/ext/numeric_limits/numeric_limits.cc: ... here.
* include/Makefile.in: Regenerate.
Index: include/ext/pb_ds/detail/type_utils.hpp
===================================================================
--- include/ext/pb_ds/detail/type_utils.hpp (revision 123501)
+++ include/ext/pb_ds/detail/type_utils.hpp (working copy)
@@ -52,6 +52,7 @@
#include <utility>
#include <tr1/type_traits>
#include <ext/type_traits.h>
+#include <ext/numeric_limits.h>
namespace pb_ds
{
@@ -76,7 +77,7 @@
typedef std::tr1::integral_constant<int, 0> false_type;
using __gnu_cxx::__conditional_type;
- using __gnu_cxx::__numeric_traits;
+ using __gnu_cxx::__numeric_limits;
template<typename T>
struct is_const_pointer
Index: include/ext/pb_ds/trie_policy.hpp
===================================================================
--- include/ext/pb_ds/trie_policy.hpp (revision 123501)
+++ include/ext/pb_ds/trie_policy.hpp (working copy)
@@ -69,8 +69,8 @@
// Element access traits for string types.
template<typename String = std::string,
- typename String::value_type Min_E_Val = detail::__numeric_traits<typename String::value_type>::__min,
- typename String::value_type Max_E_Val = detail::__numeric_traits<typename String::value_type>::__max,
+ typename String::value_type Min_E_Val = detail::__numeric_limits<typename String::value_type>::__min,
+ typename String::value_type Max_E_Val = detail::__numeric_limits<typename String::value_type>::__max,
bool Reverse = false,
typename Allocator = std::allocator<char> >
struct string_trie_e_access_traits
Index: include/ext/numeric_limits.h
===================================================================
--- include/ext/numeric_limits.h (revision 0)
+++ include/ext/numeric_limits.h (revision 0)
@@ -0,0 +1,98 @@
+// -*- C++ -*-
+
+// Copyright (C) 2007 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 terms
+// of the GNU General Public License as published by the Free Software
+// Foundation; either version 2, or (at your option) any later
+// version.
+
+// This library is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+/** @file ext/numeric_limits.h
+ * This file is a GNU extension to the Standard C++ Library.
+ */
+
+#ifndef _EXT_NUMERIC_LIMITS
+#define _EXT_NUMERIC_LIMITS 1
+
+#pragma GCC system_header
+
+#include <limits>
+#include <bits/cpp_type_traits.h>
+#include <ext/type_traits.h>
+
+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
+
+ // Compile time constants for builtin types.
+ // Sadly std::numeric_limits member functions cannot be used for this.
+#define __glibcxx_signed(_Tp) ((_Tp)(-1) < 0)
+#define __glibcxx_digits(_Tp) \
+ (sizeof(_Tp) * __CHAR_BIT__ - __glibcxx_signed(_Tp))
+
+#define __glibcxx_min(_Tp) \
+ (__glibcxx_signed(_Tp) ? (_Tp)1 << __glibcxx_digits(_Tp) : (_Tp)0)
+
+#define __glibcxx_max(_Tp) \
+ (__glibcxx_signed(_Tp) ? \
+ (((((_Tp)1 << (__glibcxx_digits(_Tp) - 1)) - 1) << 1) + 1) : ~(_Tp)0)
+
+ template<typename _Value>
+ struct __numeric_limits_integer
+ {
+ // Only integers for initialization of member constant.
+ static const _Value __min = __glibcxx_min(_Value);
+ static const _Value __max = __glibcxx_max(_Value);
+ };
+
+ template<typename _Value>
+ const _Value __numeric_limits_integer<_Value>::__min;
+
+ template<typename _Value>
+ const _Value __numeric_limits_integer<_Value>::__max;
+
+ template<typename _Value>
+ struct __numeric_limits_floating
+ {
+ // Only floating point types. See N1822.
+ static const int __max_digits10 =
+ 2 + std::numeric_limits<_Value>::digits * 3010/10000;
+ };
+
+ template<typename _Value>
+ const int __numeric_limits_floating<_Value>::__max_digits10;
+
+ template<typename _Value>
+ struct __numeric_limits
+ : public __conditional_type<std::__is_integer<_Value>::__value,
+ __numeric_limits_integer<_Value>,
+ __numeric_limits_floating<_Value> >::__type
+ { };
+
+_GLIBCXX_END_NAMESPACE
+
+#undef __glibcxx_signed
+#undef __glibcxx_min
+#undef __glibcxx_max
+#undef __glibcxx_digits
+
+#endif
Index: include/ext/type_traits.h
===================================================================
--- include/ext/type_traits.h (revision 123501)
+++ include/ext/type_traits.h (working copy)
@@ -37,7 +37,7 @@
#pragma GCC system_header
-#include <limits>
+#include <bits/c++config.h>
#include <bits/cpp_type_traits.h>
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
@@ -147,57 +147,6 @@
template<>
struct __remove_unsigned<wchar_t>;
-
- // Compile time constants for builtin types.
- // Sadly std::numeric_limits member functions cannot be used for this.
-#define __glibcxx_signed(_Tp) ((_Tp)(-1) < 0)
-#define __glibcxx_digits(_Tp) \
- (sizeof(_Tp) * __CHAR_BIT__ - __glibcxx_signed(_Tp))
-
-#define __glibcxx_min(_Tp) \
- (__glibcxx_signed(_Tp) ? (_Tp)1 << __glibcxx_digits(_Tp) : (_Tp)0)
-
-#define __glibcxx_max(_Tp) \
- (__glibcxx_signed(_Tp) ? \
- (((((_Tp)1 << (__glibcxx_digits(_Tp) - 1)) - 1) << 1) + 1) : ~(_Tp)0)
-
- template<typename _Value>
- struct __numeric_traits_integer
- {
- // Only integers for initialization of member constant.
- static const _Value __min = __glibcxx_min(_Value);
- static const _Value __max = __glibcxx_max(_Value);
- };
-
- template<typename _Value>
- const _Value __numeric_traits_integer<_Value>::__min;
-
- template<typename _Value>
- const _Value __numeric_traits_integer<_Value>::__max;
-
- template<typename _Value>
- struct __numeric_traits_floating
- {
- // Only floating point types. See N1822.
- static const int __max_digits10 =
- 2 + std::numeric_limits<_Value>::digits * 3010/10000;
- };
-
- template<typename _Value>
- const int __numeric_traits_floating<_Value>::__max_digits10;
-
- template<typename _Value>
- struct __numeric_traits
- : public __conditional_type<std::__is_integer<_Value>::__value,
- __numeric_traits_integer<_Value>,
- __numeric_traits_floating<_Value> >::__type
- { };
-
_GLIBCXX_END_NAMESPACE
-#undef __glibcxx_signed
-#undef __glibcxx_min
-#undef __glibcxx_max
-#undef __glibcxx_digits
-
#endif
Index: include/Makefile.in
===================================================================
--- include/Makefile.in (revision 123501)
+++ include/Makefile.in (working copy)
@@ -743,6 +743,7 @@
${ext_srcdir}/mt_allocator.h \
${ext_srcdir}/new_allocator.h \
${ext_srcdir}/numeric \
+ ${ext_srcdir}/numeric_limits.h \
${ext_srcdir}/pod_char_traits.h \
${ext_srcdir}/pool_allocator.h \
${ext_srcdir}/rb_tree \
Index: include/tr1/random
===================================================================
--- include/tr1/random (revision 123501)
+++ include/tr1/random (working copy)
@@ -44,6 +44,7 @@
#include <tr1/type_traits>
#include <tr1/cmath>
#include <ext/type_traits.h>
+#include <ext/numeric_limits.h>
#include <bits/concept_check.h>
#include <debug/debug.h>
Index: include/tr1/random.tcc
===================================================================
--- include/tr1/random.tcc (revision 123501)
+++ include/tr1/random.tcc (working copy)
@@ -801,7 +801,7 @@
const std::streamsize __precision = __os.precision();
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__os.widen(' '));
- __os.precision(__gnu_cxx::__numeric_traits<double>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<double>::__max_digits10);
__os << __x.p();
@@ -848,7 +848,7 @@
const std::streamsize __precision = __os.precision();
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__os.widen(' '));
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.p();
@@ -1012,7 +1012,7 @@
const _CharT __space = __os.widen(' ');
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__space);
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.mean() << __space << __x._M_nd;
@@ -1250,7 +1250,7 @@
const _CharT __space = __os.widen(' ');
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__space);
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.t() << __space << __x.p()
<< __space << __x._M_nd;
@@ -1295,7 +1295,7 @@
const _CharT __space = __os.widen(' ');
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__space);
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.min() << __space << __x.max();
@@ -1336,7 +1336,7 @@
const std::streamsize __precision = __os.precision();
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__os.widen(' '));
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.lambda();
@@ -1401,7 +1401,7 @@
const _CharT __space = __os.widen(' ');
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__space);
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x._M_saved_available << __space
<< __x.mean() << __space
@@ -1533,7 +1533,7 @@
const std::streamsize __precision = __os.precision();
__os.flags(__ios_base::scientific | __ios_base::left);
__os.fill(__os.widen(' '));
- __os.precision(__gnu_cxx::__numeric_traits<_RealType>::__max_digits10);
+ __os.precision(__gnu_cxx::__numeric_limits<_RealType>::__max_digits10);
__os << __x.alpha();
Index: include/Makefile.am
===================================================================
--- include/Makefile.am (revision 123501)
+++ include/Makefile.am (working copy)
@@ -512,6 +512,7 @@
${ext_srcdir}/mt_allocator.h \
${ext_srcdir}/new_allocator.h \
${ext_srcdir}/numeric \
+ ${ext_srcdir}/numeric_limits.h \
${ext_srcdir}/pod_char_traits.h \
${ext_srcdir}/pool_allocator.h \
${ext_srcdir}/rb_tree \
Index: testsuite/ext/numeric_limits/numeric_limits.cc
===================================================================
--- testsuite/ext/numeric_limits/numeric_limits.cc (revision 0)
+++ testsuite/ext/numeric_limits/numeric_limits.cc (revision 0)
@@ -0,0 +1,28 @@
+// { dg-do compile }
+// { dg-options "-pedantic" }
+// -*- C++ -*-
+
+// Copyright (C) 2006 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+#include <ext/numeric_limits.h>
+
+using __gnu_cxx::__numeric_limits;
+template struct __numeric_limits<short>;
+template struct __numeric_limits<unsigned short>;
+template struct __numeric_limits<double>;
Index: testsuite/ext/type_traits/numeric_traits.cc
===================================================================
--- testsuite/ext/type_traits/numeric_traits.cc (revision 123501)
+++ testsuite/ext/type_traits/numeric_traits.cc (working copy)
@@ -1,28 +0,0 @@
-// { dg-do compile }
-// { dg-options "-pedantic" }
-// -*- C++ -*-
-
-// Copyright (C) 2006 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
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING. If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-#include <ext/type_traits.h>
-
-using __gnu_cxx::__numeric_traits;
-template struct __numeric_traits<short>;
-template struct __numeric_traits<unsigned short>;
-template struct __numeric_traits<double>;