diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:39:10 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:39:10 -0400 |
| commit | 44eaaa507cf96c1e456fe48fd6969c6ace66b919 (patch) | |
| tree | f39536623c5f9fff80ef94bd15d3a6f21ef10403 /indra/llmath | |
| parent | 2c1647e84cfb3fd712f665cdc77a772deb80aff9 (diff) | |
| parent | f69ac40e24e78fe265c81ff3785c185229764151 (diff) | |
Merge remote-tracking branch 'release/maint-b' into nat/maint-b-tests
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcalcparser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index dff5bf3af3..663764ce04 100644 --- a/indra/llmath/llcalcparser.h +++ b/indra/llmath/llcalcparser.h @@ -131,14 +131,14 @@ struct LLCalcParser : grammar<LLCalcParser> power = unary_expr[power.value = arg1] >> - *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&powf)(power.value, arg1)])) + *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&LLCalcParser::_pow)(self, power.value, arg1)])) ; term = power[term.value = arg1] >> *(('*' >> assert_syntax(power[term.value *= arg1])) | ('/' >> assert_syntax(power[term.value /= arg1])) | - ('%' >> assert_syntax(power[term.value = phoenix::bind(&fmodf)(term.value, arg1)])) + ('%' >> assert_syntax(power[term.value = phoenix::bind(&LLCalcParser::_fmod)(self, term.value, arg1)])) ) ; @@ -177,6 +177,8 @@ private: F32 _floor(const F32& a) const { return (F32)llfloor(a); } F32 _ceil(const F32& a) const { return llceil(a); } F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); } + F32 _pow(const F32& a, const F32& b) const { return powf(a, b); } + F32 _fmod(const F32&a, const F32& b) const { return fmodf(a, b); } LLCalc::calc_map_t* mConstants; LLCalc::calc_map_t* mVariables; |