aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-12-13 15:01:02 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-12-13 15:01:02 +0000
commit273dfd213e2db3efd9ff717c183d7087c1077091 (patch)
tree53aba2244d5dac20a8ce12d7800bad48398466fd
parent76ecaf0945f32e64d4d4839ed04a1bcaaebbfd44 (diff)
downloadgcc-273dfd213e2db3efd9ff717c183d7087c1077091.zip
gcc-273dfd213e2db3efd9ff717c183d7087c1077091.tar.gz
gcc-273dfd213e2db3efd9ff717c183d7087c1077091.tar.bz2
type_traits (extent): Minor tweak (i.e., public).
2004-12-13 Paolo Carlini <pcarlini@suse.de> * include/tr1/type_traits (extent): Minor tweak (i.e., public). From-SVN: r92088
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/tr1/type_traits12
2 files changed, 11 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 63e4842..6c04728 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-13 Paolo Carlini <pcarlini@suse.de>
+
+ * include/tr1/type_traits (extent): Minor tweak (i.e., public).
+
2004-12-12 Paolo Carlini <pcarlini@suse.de>
* include/tr1/type_traits: Minor tweak.
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index fa0ae85..d994dfe 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -246,18 +246,20 @@ namespace tr1
template<typename, unsigned = 0>
struct extent
- : integral_constant<std::size_t, 0> { };
+ : public integral_constant<std::size_t, 0> { };
template<typename _Tp, unsigned _Uint, std::size_t _Size>
struct extent<_Tp[_Size], _Uint>
- : integral_constant<std::size_t,
- _Uint == 0 ? _Size : extent<_Tp, _Uint - 1>::value>
+ : public integral_constant<std::size_t,
+ _Uint == 0 ? _Size : extent<_Tp,
+ _Uint - 1>::value>
{ };
template<typename _Tp, unsigned _Uint>
struct extent<_Tp[], _Uint>
- : integral_constant<std::size_t,
- _Uint == 0 ? 0 : extent<_Tp, _Uint - 1>::value>
+ : public integral_constant<std::size_t,
+ _Uint == 0 ? 0 : extent<_Tp,
+ _Uint - 1>::value>
{ };
/// @brief relationships between types [4.6].