mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-14 10:39:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11 from osyo-manga/apply_visitor_bug_fix

Browse source 
fix apply_visitor.
This commit is contained in:
Bolero MURAKAMI 2012-12-18 15:34:24 -08:00
commit 9ee3e03ddd
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/variant/test/variant.cpp
View file

@ -170,6 +170,18 @@ namespace testspr {
TESTSPR_ASSERT(var3.which() == 0); TESTSPR_ASSERT(var3.which() == 0);
TESTSPR_ASSERT(sprout::get<int>(var3) == 0); TESTSPR_ASSERT(sprout::get<int>(var3) == 0);
} }
{
testspr::x2_visitor<double> visitor1 = {};
TESTSPR_BOTH_ASSERT(sprout::apply_visitor(visitor1, var1) == 2.0);
TESTSPR_BOTH_ASSERT(sprout::apply_visitor(visitor1, var2) == 0.0);
}
{
auto var3 = var2;
testspr::x2_assign_visitor<double> visitor1 = {};
TESTSPR_ASSERT(sprout::apply_visitor(visitor1, var3) == 0.0);
TESTSPR_ASSERT(var3.which() == 0);
TESTSPR_ASSERT(sprout::get<int>(var3) == 0);
}
// operator<< // operator<<
{ {

2
sprout/variant/apply_visitor.hpp
View file

@ -6,7 +6,7 @@
namespace sprout { namespace sprout {
template<typename Visitor, typename Visitable> template<typename Visitor, typename Visitable>
inline SPROUT_CONSTEXPR typename Visitor::result_type inline SPROUT_CONSTEXPR typename std::decay<Visitor>::type::result_type
apply_visitor(Visitor&& visitor, Visitable&& visitable) { apply_visitor(Visitor&& visitor, Visitable&& visitable) {
return sprout::forward<Visitable>(visitable).apply_visitor(sprout::forward<Visitor>(visitor)); return sprout::forward<Visitable>(visitable).apply_visitor(sprout::forward<Visitor>(visitor));
} }

10
sprout/variant/variant.hpp
View file

@ -127,14 +127,14 @@ namespace sprout {
template<int I, typename Tuple, typename Visitor> template<int I, typename Tuple, typename Visitor>
static SPROUT_CONSTEXPR typename std::enable_if< static SPROUT_CONSTEXPR typename std::enable_if<
I == sizeof...(Types), I == sizeof...(Types),
typename Visitor::result_type typename std::decay<Visitor>::type::result_type
>::type visit(Tuple&& t, Visitor&& v, int which) { >::type visit(Tuple&& t, Visitor&& v, int which) {
return typename Visitor::result_type(); return typename std::decay<Visitor>::type::result_type();
} }
template<int I, typename Tuple, typename Visitor> template<int I, typename Tuple, typename Visitor>
static SPROUT_CONSTEXPR typename std::enable_if< static SPROUT_CONSTEXPR typename std::enable_if<
I != sizeof...(Types), I != sizeof...(Types),
typename Visitor::result_type typename std::decay<Visitor>::type::result_type
>::type visit(Tuple&& t, Visitor&& v, int which) { >::type visit(Tuple&& t, Visitor&& v, int which) {
return I == which return I == which
? sprout::forward<Visitor>(v)(sprout::tuples::get<I>(sprout::forward<Tuple>(t))) ? sprout::forward<Visitor>(v)(sprout::tuples::get<I>(sprout::forward<Tuple>(t)))
@ -249,11 +249,11 @@ namespace sprout {
} }
// visitation support // visitation support
template<typename Visitor> template<typename Visitor>
SPROUT_CONSTEXPR typename Visitor::result_type apply_visitor(Visitor&& visitor) const { SPROUT_CONSTEXPR typename std::decay<Visitor>::type::result_type apply_visitor(Visitor&& visitor) const {
return visit<0>(tuple_, sprout::forward<Visitor>(visitor), which_); return visit<0>(tuple_, sprout::forward<Visitor>(visitor), which_);
} }
template<typename Visitor> template<typename Visitor>
typename Visitor::result_type apply_visitor(Visitor&& visitor) { typename std::decay<Visitor>::type::result_type apply_visitor(Visitor&& visitor) {
return visit<0>(tuple_, sprout::forward<Visitor>(visitor), which_); return visit<0>(tuple_, sprout::forward<Visitor>(visitor), which_);
} }
}; };