git-svn-id: svn://db.shs.com.ru/pip@649 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2018-10-17 12:55:40 +00:00
parent 74a0743045
commit b8db3b5010
5 changed files with 19 additions and 11 deletions
--- a/src_main/math/pievaluator.h
+++ b/src_main/math/pievaluator.h
@@ -29,12 +29,11 @@
 typedef complexd (*FuncFunc)(void * , int, complexd * );

 namespace PIEvaluatorTypes {
-	static const int operationCount = 14;

 	enum PIP_EXPORT eType {etNumber, etOperator, etVariable, etFunction};
 	enum PIP_EXPORT Operation {oNone, oAdd, oSubtract, oMultiply, oDivide, oResidue, oPower,
 					oEqual, oNotEqual, oGreater, oSmaller, oGreaterEqual, oSmallerEqual,
-					oAnd, oOr, oFunction
+					oAnd, oOr, oOperatorsCount, oFunction
 	};
 	enum PIP_EXPORT BaseFunctions {bfUnknown, bfSin, bfCos, bfTg, bfCtg,
 						bfArcsin, bfArccos, bfArctg, bfArcctg,