From 798c527173d10b805cf958d8027512502c81b787 Mon Sep 17 00:00:00 2001 From: Joel de Guzman Date: Tue, 26 Sep 2006 22:37:55 +0000 Subject: [PATCH] fixed g++ complaining "error: shadows template parm" [SVN r35347] --- .../adapted/std_pair/Attic/std_pair_iterator.hpp | 10 +++++----- .../sequence/adapted/std_pair/std_pair_iterator.hpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/boost/fusion/sequence/adapted/std_pair/Attic/std_pair_iterator.hpp b/include/boost/fusion/sequence/adapted/std_pair/Attic/std_pair_iterator.hpp index fde36144..799bd90d 100644 --- a/include/boost/fusion/sequence/adapted/std_pair/Attic/std_pair_iterator.hpp +++ b/include/boost/fusion/sequence/adapted/std_pair/Attic/std_pair_iterator.hpp @@ -21,14 +21,14 @@ namespace boost { namespace fusion { struct random_access_traversal_tag; - template + template struct std_pair_iterator - : iterator_facade, random_access_traversal_tag> + : iterator_facade, random_access_traversal_tag> { - BOOST_MPL_ASSERT_RELATION(N, >=, 0); - BOOST_MPL_ASSERT_RELATION(N, <=, 2); + BOOST_MPL_ASSERT_RELATION(N_, >=, 0); + BOOST_MPL_ASSERT_RELATION(N_, <=, 2); - typedef mpl::int_ index; + typedef mpl::int_ index; typedef Pair_ pair_type; std_pair_iterator(Pair_& pair) diff --git a/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp b/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp index fde36144..799bd90d 100644 --- a/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp +++ b/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp @@ -21,14 +21,14 @@ namespace boost { namespace fusion { struct random_access_traversal_tag; - template + template struct std_pair_iterator - : iterator_facade, random_access_traversal_tag> + : iterator_facade, random_access_traversal_tag> { - BOOST_MPL_ASSERT_RELATION(N, >=, 0); - BOOST_MPL_ASSERT_RELATION(N, <=, 2); + BOOST_MPL_ASSERT_RELATION(N_, >=, 0); + BOOST_MPL_ASSERT_RELATION(N_, <=, 2); - typedef mpl::int_ index; + typedef mpl::int_ index; typedef Pair_ pair_type; std_pair_iterator(Pair_& pair)