Subject: [Boost-commit] svn:boost r62492 - in sandbox/SOC/2010/bit_masks: boost/integer/details/bit_mask_group_fusion_ext boost/integer/details/bit_mask_group_fusion_ext/details lib/integer/test
From: bbartmanboost_at_[hidden]
Date: 2010-06-06 16:05:18
Author: bbartman
Date: 2010-06-06 16:05:16 EDT (Sun, 06 Jun 2010)
New Revision: 62492
URL: http://svn.boost.org/trac/boost/changeset/62492
Log:
Fixing bug stuff related to the fusion sequence extention I'm working on
Text files modified:
sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/bit_mask_group_iterator.hpp | 7 ++-----
sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/details/begin_impl.hpp | 1 +
sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/tag_of.hpp | 8 --------
sandbox/SOC/2010/bit_masks/lib/integer/test/bit_mask_group_test.cpp | 11 ++++++++++-
4 files changed, 13 insertions(+), 14 deletions(-)
Modified: sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/bit_mask_group_iterator.hpp
==============================================================================
--- sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/bit_mask_group_iterator.hpp (original)
+++ sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/bit_mask_group_iterator.hpp 2010-06-06 16:05:16 EDT (Sun, 06 Jun 2010)
@@ -3,9 +3,6 @@
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-
-
-
#ifndef BOOST_BIT_MASK_GROUP_ITERATOR_HPP
#define BOOST_BIT_MASK_GROUP_ITERATOR_HPP
@@ -25,9 +22,9 @@
*/
template<typename MaskGroup, unsigned int Pos>
struct bit_mask_group_iterator
- : boost::fusion::iterator_facade<
+ : iterator_facade<
bit_mask_group_iterator<MaskGroup, Pos>,
- boost::fusion::random_access_traversal_tag
+ random_access_traversal_tag
>
{
// TODO: At a later time add preconditions for the iterator.
Modified: sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/details/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/details/begin_impl.hpp (original)
+++ sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/details/begin_impl.hpp 2010-06-06 16:05:16 EDT (Sun, 06 Jun 2010)
@@ -5,6 +5,7 @@
#ifndef BOOST_BIT_MASK_GROUP_FUSION_EXT_BEGIN_IMPL_HPP
#define BOOST_BIT_MASK_GROUP_FUSION_EXT_BEGIN_IMPL_HPP
+#include "../bit_mask_group_iterator.hpp"
namespace boost { namespace fusion {
Modified: sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/tag_of.hpp
==============================================================================
--- sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/tag_of.hpp (original)
+++ sandbox/SOC/2010/bit_masks/boost/integer/details/bit_mask_group_fusion_ext/tag_of.hpp 2010-06-06 16:05:16 EDT (Sun, 06 Jun 2010)
@@ -27,14 +27,6 @@
typedef bit_mask_group_tag type;
};
-
- /** Iterator tag_of specilization. */
- template <typename Extra>
- template <typename MaskGroup, std::size_t Pos>
- struct tag_of< boost::fusion::bit_mask_group_iterator< MaskGroup, Pos >, Extra> {
- typedef bit_mask_group_iterator_tag type;
- };
-
}}} // end boost::fusion::traits
#endif
Modified: sandbox/SOC/2010/bit_masks/lib/integer/test/bit_mask_group_test.cpp
==============================================================================
--- sandbox/SOC/2010/bit_masks/lib/integer/test/bit_mask_group_test.cpp (original)
+++ sandbox/SOC/2010/bit_masks/lib/integer/test/bit_mask_group_test.cpp 2010-06-06 16:05:16 EDT (Sun, 06 Jun 2010)
@@ -61,6 +61,16 @@
BOOST_ASSERT(( traits::is_sequence<bmg_t>::value ));
BOOST_ASSERT(( ! traits::is_view<bmg_t>::value ));
+
+ // testing tag_of for bit_mask_group.
+ BOOST_MPL_ASSERT((
+ is_same<
+ traits::tag_of<bmg_t>::type,
+ bit_mask_group_tag
+ >
+ ));
+
+
// create an instance of this type and then test the rest
// of the functions which are implemented on this type to make sure they
// work.
@@ -70,7 +80,6 @@
// BOOST_ASSERT(( ));
// BOOST_ASSERT(( ));
// BOOST_ASSERT(( ));
- // BOOST_ASSERT(( ));
#if 0