0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix msvc build

Browse source
This commit is contained in:
gfgtdf 2016-03-21 17:34:14 +01:00
parent 72c5abc87e
commit 1094db6871
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/formula/formula.cpp
View file

@ -455,9 +455,9 @@ public:
} else if(op == "./") {
op_ = DIVL;
} else if(op == "..") {
op_ = CAT;
op_ = OP_CAT;
} else if(op == "in") {
op_ = IN;
op_ = OP_IN;
}
}
@ -494,9 +494,9 @@ private:
return left.list_elements_mul(right);
case DIVL:
return left.list_elements_div(right);
case IN:
case OP_IN:
return variant(right.contains(left));
case CAT:
case OP_CAT:
return left.concatenate(right);
case EQ:
return left == right ? variant(1) : variant(0);
@ -534,7 +534,8 @@ private:
return res;
}
enum OP { AND, OR, NEQ, LTE, GTE, CAT, IN, GT='>', LT='<', EQ='=', RAN='~',
//In some cases a IN or CAT macros are defined.
enum OP { AND, OR, NEQ, LTE, GTE, OP_CAT, OP_IN, GT='>', LT='<', EQ='=', RAN='~',
ADD='+', SUB='-', MUL='*', DIV='/', ADDL, SUBL, MULL, DIVL, DICE='d', POW='^', MOD='%' };
OP op_;

4
src/formula/function.cpp
View file

@ -597,7 +597,7 @@ public:
private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double num = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = num < 0 ? -pow(-num, 1.0l / 3.0l) : pow(num, 1.0l / 3.0l);
const double result = num < 0 ? -pow(-num, 1.0 / 3.0) : pow(num, 1.0 / 3.0);
return variant(result, variant::DECIMAL_VARIANT);
}
};
@ -611,7 +611,7 @@ private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double base = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double root = args()[1]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = base < 0 && fmod(root,2) == 1 ? -pow(-base, 1.0l / root) : pow(base, 1.0l / root);
const double result = base < 0 && fmod(root,2) == 1 ? -pow(-base, 1.0 / root) : pow(base, 1.0 / root);
if(result != result) {
return variant();
}

2
src/lua/ldo.cpp
View file

@ -11,7 +11,7 @@
#define ldo_c
#define LUA_CORE
#include "lua_jailbreak_exception.hpp"
#include "../lua_jailbreak_exception.hpp"
#include <exception>
#if !defined(__cplusplus)
#error "Exception support requires a C++ compiler."