From 541a5becbd135bf94364e640056f6025df998d1e Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 26 Apr 2014 10:53:10 +0300 Subject: [PATCH] Use standard math constants in tests. --HG-- branch : feature --- src/libs/qmuparser/qmuparsertest.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index 965060cce..59eedf24d 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -21,15 +21,12 @@ ******************************************************************************************************/ #include "qmuparsertest.h" +#include #include -#include #include #include -#define PARSER_CONST_PI 3.141592653589793238462643 -#define PARSER_CONST_E 2.718281828459045235360287 - using namespace std; /** \file @@ -594,7 +591,7 @@ namespace qmu iStat += EqnTest( "-(-1)", 1, true); iStat += EqnTest( "-(-1)*2", 2, true); iStat += EqnTest( "-(-2)*sqrt(4)", 4, true); - iStat += EqnTest( "-_pi", -PARSER_CONST_PI, true); + iStat += EqnTest( "-_pi", -M_PI, true); iStat += EqnTest( "-a", -1, true); iStat += EqnTest( "-(a)", -1, true); iStat += EqnTest( "-(-a)", 1, true); @@ -1154,8 +1151,8 @@ namespace qmu p1.reset(new qmu::QmuParser()); // Add constants - p1->DefineConst( "pi", (qreal)PARSER_CONST_PI); - p1->DefineConst( "e", (qreal)PARSER_CONST_E); + p1->DefineConst( "pi", (qreal)M_PI); + p1->DefineConst( "e", (qreal)M_E); p1->DefineConst( "const", 1); p1->DefineConst( "const1", 2); p1->DefineConst( "const2", 3);