diff options
author | Marius Kintel <marius@kintel.net> | 2011-01-21 22:04:13 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-01-21 22:04:13 (GMT) |
commit | 0419cd823216b6ade267d4e0bdd071242aa8bc55 (patch) | |
tree | 395bf49dbe96d4d46cf76c86c92746b89bd4b4f9 /src/func.cc | |
parent | 195d21dd2d535a3ff06d3f3dfe1b1cdbabd4a0d8 (diff) | |
parent | 52a474eb5213cfdda7b4825d51861de27b48954f (diff) |
Merge branch 'meta23-master'
Diffstat (limited to 'src/func.cc')
-rw-r--r-- | src/func.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/func.cc b/src/func.cc index 59821e3..2608960 100644 --- a/src/func.cc +++ b/src/func.cc @@ -29,7 +29,8 @@ #include "context.h" #include "dxfdim.h" #include "builtin.h" -#include <math.h> +#include "mathc99.h" +#include <time.h> AbstractFunction::~AbstractFunction() { @@ -290,7 +291,7 @@ Value builtin_log(const Context *, const QVector<QString>&, const QVector<Value> if (args.size() == 2 && args[0].type == Value::NUMBER && args[1].type == Value::NUMBER) return Value(log(args[1].num) / log(args[0].num)); if (args.size() == 1 && args[0].type == Value::NUMBER) - return Value(log(args[0].num) / log(10)); + return Value(log(args[0].num) / log(10.0)); return Value(); } |