boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-10-02 02:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix equal<vector,vector::type> issue (http://thread.gmane.org/gmane.comp.lib.boost.devel/118872)

Browse Source 
[SVN r28913]
This commit is contained in:
Aleksey Gurtovoy
2005-05-15 00:39:04 +00:00
parent 94145ff494
commit 9fba964633
2 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/mpl/vector/aux_/item.hpp
View File

@@ -37,6 +37,7 @@ struct v_item
typedef typename next<index_>::type upper_bound_; typedef typename next<index_>::type upper_bound_;
typedef typename next<typename Base::size>::type size; typedef typename next<typename Base::size>::type size;
typedef Base base; typedef Base base;
typedef v_item type;
// agurt 10/sep/04: MWCW <= 9.3 workaround here and below; the compiler // agurt 10/sep/04: MWCW <= 9.3 workaround here and below; the compiler
// breaks if using declaration comes _before_ the new overload // breaks if using declaration comes _before_ the new overload
@@ -55,6 +56,7 @@ struct v_item<T,Base,1>
typedef index_ lower_bound_; typedef index_ lower_bound_;
typedef typename next<typename Base::size>::type size; typedef typename next<typename Base::size>::type size;
typedef Base base; typedef Base base;
typedef v_item type;
static aux::type_wrapper<T> item_(index_); static aux::type_wrapper<T> item_(index_);
using Base::item_; using Base::item_;
@@ -72,6 +74,7 @@ struct v_mask
typedef index_ upper_bound_; typedef index_ upper_bound_;
typedef typename prior<typename Base::size>::type size; typedef typename prior<typename Base::size>::type size;
typedef Base base; typedef Base base;
typedef v_mask type;
static aux::type_wrapper<void_> item_(index_); static aux::type_wrapper<void_> item_(index_);
using Base::item_; using Base::item_;
@@ -87,6 +90,7 @@ struct v_mask<Base,1>
typedef typename next<index_>::type lower_bound_; typedef typename next<index_>::type lower_bound_;
typedef typename prior<typename Base::size>::type size; typedef typename prior<typename Base::size>::type size;
typedef Base base; typedef Base base;
typedef v_mask type;
static aux::type_wrapper<void_> item_(index_); static aux::type_wrapper<void_> item_(index_);
using Base::item_; using Base::item_;

43
test/vector.cpp
View File

@@ -1,5 +1,5 @@
// Copyright Aleksey Gurtovoy 2000-2004 // Copyright Aleksey Gurtovoy 2000-2005
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,6 +13,7 @@
#include <boost/mpl/vector.hpp> #include <boost/mpl/vector.hpp>
#include <boost/mpl/vector/vector10.hpp> #include <boost/mpl/vector/vector10.hpp>
#include <boost/mpl/equal.hpp>
#include <boost/mpl/push_back.hpp> #include <boost/mpl/push_back.hpp>
#include <boost/mpl/pop_back.hpp> #include <boost/mpl/pop_back.hpp>
#include <boost/mpl/push_front.hpp> #include <boost/mpl/push_front.hpp>
@@ -32,6 +33,11 @@ MPL_TEST_CASE()
typedef vector2<char,long> v2; typedef vector2<char,long> v2;
typedef vector9<char,char,char,char,char,char,char,char,int> v9; typedef vector9<char,char,char,char,char,char,char,char,int> v9;
MPL_ASSERT(( equal< v0,v0::type > ));
MPL_ASSERT(( equal< v1,v1::type > ));
MPL_ASSERT(( equal< v2,v2::type > ));
MPL_ASSERT(( equal< v9,v9::type > ));
MPL_ASSERT_RELATION( size<v0>::value, ==, 0 ); MPL_ASSERT_RELATION( size<v0>::value, ==, 0 );
MPL_ASSERT_RELATION( size<v1>::value, ==, 1 ); MPL_ASSERT_RELATION( size<v1>::value, ==, 1 );
MPL_ASSERT_RELATION( size<v2>::value, ==, 2 ); MPL_ASSERT_RELATION( size<v2>::value, ==, 2 );
@@ -68,15 +74,35 @@ MPL_TEST_CASE()
{ {
typedef vector0<> v0; typedef vector0<> v0;
typedef push_back<v0,int>::type v1; typedef push_back<v0,int>::type v1;
MPL_ASSERT(( is_same< back<v1>::type,int > )); typedef push_front<v1,char>::type v2;
typedef push_back<v2,long>::type v3;
typedef push_front<v1,char>::type v2; MPL_ASSERT(( is_same< back<v1>::type,int > ));
MPL_ASSERT(( is_same< back<v2>::type,int > )); MPL_ASSERT(( is_same< back<v2>::type,int > ));
MPL_ASSERT(( is_same< front<v2>::type,char > )); MPL_ASSERT(( is_same< front<v2>::type,char > ));
typedef push_back<v2,long>::type v3;
MPL_ASSERT(( is_same< back<v3>::type,long > )); MPL_ASSERT(( is_same< back<v3>::type,long > ));
MPL_ASSERT(( equal< v1,v1::type > ));
MPL_ASSERT(( equal< v2,v2::type > ));
MPL_ASSERT(( equal< v3,v3::type > ));
}
MPL_TEST_CASE()
{
typedef vector9<char,bool,char,char,char,char,bool,long,int> v9;
typedef pop_back<v9>::type v8;
typedef pop_front<v8>::type v7;
MPL_ASSERT(( is_same< back<v9>::type,int > ));
MPL_ASSERT(( is_same< back<v8>::type,long > ));
MPL_ASSERT(( is_same< back<v7>::type,long > ));
MPL_ASSERT(( is_same< front<v7>::type,bool > ));
MPL_ASSERT(( equal< v9,v9::type > ));
MPL_ASSERT(( equal< v8,v8::type > ));
MPL_ASSERT(( equal< v7,v7::type > ));
} }
MPL_TEST_CASE() MPL_TEST_CASE()
@@ -86,6 +112,11 @@ MPL_TEST_CASE()
typedef vector<char,long> v2; typedef vector<char,long> v2;
typedef vector<char,char,char,char,char,char,char,char,int> v9; typedef vector<char,char,char,char,char,char,char,char,int> v9;
MPL_ASSERT(( equal< v0,v0::type > ));
MPL_ASSERT(( equal< v1,v1::type > ));
MPL_ASSERT(( equal< v2,v2::type > ));
MPL_ASSERT(( equal< v9,v9::type > ));
MPL_ASSERT_RELATION( size<v0>::value, ==, 0 ); MPL_ASSERT_RELATION( size<v0>::value, ==, 0 );
MPL_ASSERT_RELATION( size<v1>::value, ==, 1 ); MPL_ASSERT_RELATION( size<v1>::value, ==, 1 );
MPL_ASSERT_RELATION( size<v2>::value, ==, 2 ); MPL_ASSERT_RELATION( size<v2>::value, ==, 2 );