boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-16 05:42:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of boost::blank, close #8622

Browse Source
This commit is contained in:
Kohei Takahashi
2014-11-09 00:49:29 +09:00
parent 5dc9f457a0
commit ff56beaf55
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/sequence/intrinsic/begin.hpp
View File

@ -8,8 +8,8 @@
#define FUSION_BEGIN_04052005_1132
#include <boost/fusion/support/config.hpp>
#include <boost/blank.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/mpl/if.hpp>
#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
@ -36,7 +36,7 @@ namespace boost { namespace fusion
: mpl::if_<
traits::is_segmented<Sequence>
, detail::segmented_begin<Sequence>
, blank
, mpl::empty_base
>::type
{};
};

4
include/boost/fusion/sequence/intrinsic/end.hpp
View File

@ -8,8 +8,8 @@
#define FUSION_END_04052005_1141
#include <boost/fusion/support/config.hpp>
#include <boost/blank.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/mpl/if.hpp>
#include <boost/fusion/sequence/intrinsic_fwd.hpp>
#include <boost/fusion/support/tag_of.hpp>
@ -36,7 +36,7 @@ namespace boost { namespace fusion
: mpl::if_<
traits::is_segmented<Sequence>
, detail::segmented_end<Sequence>
, blank
, mpl::empty_base
>::type
{};
};

4
test/functional/fused.cpp
View File

@ -10,18 +10,18 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/empty_base.hpp>
namespace fusion = boost::fusion;
using boost::noncopyable;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

4
test/functional/fused_function_object.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
@ -18,7 +18,7 @@
namespace fusion = boost::fusion;
using boost::noncopyable;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

4
test/functional/fused_procedure.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
@ -26,7 +26,7 @@ int effect;
BOOST_TEST(effect == e); \
}
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

4
test/functional/make_fused.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
@ -20,7 +20,7 @@ using boost::noncopyable;
using boost::cref;
using boost::ref;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

4
test/functional/make_fused_function_object.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
@ -20,7 +20,7 @@ using boost::noncopyable;
using boost::cref;
using boost::ref;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

4
test/functional/make_fused_procedure.cpp
View File

@ -10,7 +10,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/container/vector.hpp>
@ -28,7 +28,7 @@ int effect;
BOOST_TEST(effect == e); \
}
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

12
test/functional/make_unfused.cpp
View File

@ -10,14 +10,15 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/and.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/core/enable_if.hpp>
#include <boost/fusion/sequence/intrinsic/empty.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>
@ -33,7 +34,7 @@ typedef mpl::true_ no_nullary_call;
using boost::ref;
using boost::cref;
template <class Base = boost::blank, class RemoveNullary = mpl::false_>
template <class Base = mpl::empty_base, class RemoveNullary = mpl::false_>
struct test_func
: Base
{
@ -42,8 +43,9 @@ struct test_func
template <class Self, class Seq>
struct result< Self(Seq &) >
: mpl::if_< mpl::and_< boost::fusion::result_of::empty<Seq>, RemoveNullary >,
boost::blank, mpl::identity<long> >::type
: boost::enable_if<
mpl::not_<mpl::and_<boost::fusion::result_of::empty<Seq>, RemoveNullary> >,
long>
{ };
template <typename Seq>

4
test/functional/unfused.cpp
View File

@ -10,8 +10,8 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/noncopyable.hpp>
#include <boost/blank.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>
@ -24,7 +24,7 @@ namespace mpl = boost::mpl;
using boost::noncopyable;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{

6
test/functional/unfused_typed.cpp
View File

@ -9,11 +9,9 @@
#include <boost/fusion/functional/adapter/unfused_typed.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/blank.hpp>
#include <boost/noncopyable.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/mpl/empty_base.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/mpl/placeholders.hpp>
@ -31,7 +29,7 @@ typedef fusion::vector<> types0;
typedef fusion::vector<long &> types1;
typedef fusion::vector<long &,int,char> types3;
template <class Base = boost::blank>
template <class Base = boost::mpl::empty_base>
struct test_func
: Base
{