--- parser3/src/classes/math.C 2015/10/06 22:20:50 1.78 +++ parser3/src/classes/math.C 2016/03/31 21:46:20 1.81 @@ -1,7 +1,7 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) portions from gen_uuid.c, @@ -22,7 +22,7 @@ extern "C" char *crypt(const char* , const char* ); #endif -volatile const char * IDENT_MATH_C="$Id: math.C,v 1.78 2015/10/06 22:20:50 moko Exp $"; +volatile const char * IDENT_MATH_C="$Id: math.C,v 1.81 2016/03/31 21:46:20 moko Exp $"; // defines @@ -31,16 +31,16 @@ volatile const char * IDENT_MATH_C="$Id: // class class MMath: public Methoded { -public: - MMath(); - public: // Methoded bool used_directly() { return false; } + +public: + MMath(); }; // global variables -DECLARE_CLASS_VAR(math, 0 /*fictive*/, new MMath); +DECLARE_CLASS_VAR(math, new MMath); // methods @@ -510,7 +510,7 @@ static void _crc32(Request& r, MethodPar static void toBase(unsigned long long int value, unsigned int base, char*& ptr){ static const char* hex="0123456789ABCDEF"; - int rest = value % base; + unsigned int rest = (unsigned int)(value % base); if(value >= base) toBase( (value-rest)/base, base, ptr); *ptr++=(char)hex[rest];