From f67824a2bf4063d097b22820b05e21fa1b8b2a10 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 28 Jul 2017 22:07:59 +0200 Subject: [PATCH] fixed type inconsistency in irawan.h --- src/bsdfs/irawan.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bsdfs/irawan.h b/src/bsdfs/irawan.h index 62519909..4e7b5c32 100644 --- a/src/bsdfs/irawan.h +++ b/src/bsdfs/irawan.h @@ -311,10 +311,12 @@ template struct YarnGrammar : qi::grammar> Float_ >> lit(",") >> Float_ >> lit(",") >> Float_ >> lit("}")) [ ph::bind(&Spectrum::fromLinearRGB, _val, _1, _2, _3, Spectrum::EReflectance) ]) - | (identifier [ _val = ph::bind(&Properties::getSpectrum, ph::ref(props), _1)]); + | (identifier [ _val = ph::bind((Spectrum (Properties::*)(const std::string &) const) + &Properties::getSpectrum, ph::ref(props), _1)]); flt = (Float_ [ _val = _1 ]) - | (identifier [ _val = ph::bind(&Properties::getFloat, ph::ref(props), _1)]); + | (identifier [ _val = ph::bind((Float (Properties::*)(const std::string &) const) + &Properties::getFloat, ph::ref(props), _1)]); start = lit("yarn") >> lit("{") @@ -364,7 +366,8 @@ template struct WeavePatternGrammar : qi::grammar> *(qi::alnum | char_('_')) ]; flt = (Float_ [ _val = _1 ]) - | (identifier [ _val = ph::bind(&Properties::getFloat, ph::ref(props), _1)]); + | (identifier [ _val = ph::bind((Float (Properties::*)(const std::string &) const) + &Properties::getFloat, ph::ref(props), _1)]); start = lit("weave") >> lit("{") >> ( lit("name") >> lit("=") >> name [ ph::bind(&WeavePattern::name, _val) = _1 ]