--- parser3/src/classes/int.C 2010/10/21 15:06:28 1.59 +++ parser3/src/classes/int.C 2012/04/19 19:41:29 1.61 @@ -1,12 +1,10 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_INT_C="$Date: 2010/10/21 15:06:28 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -15,6 +13,8 @@ static const char * const IDENT_INT_C="$ #include "pa_vint.h" #include "pa_vbool.h" +volatile const char * IDENT_INT_C="$Id: int.C,v 1.61 2012/04/19 19:41:29 moko Exp $" IDENT_PA_VINT_H; + // externs void _string_format(Request& r, MethodParams&); @@ -81,14 +81,12 @@ static void _div(Request& r, MethodParam static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); } // from string.C -extern -const String* sql_result_string(Request& r, MethodParams& params, - HashStringValue*& options, Value*& default_code); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); + static void _sql(Request& r, MethodParams& params) { int val; - HashStringValue* options; Value* default_code=0; - if(const String* string=sql_result_string(r, params, options, default_code)) + if(const String* string=sql_result_string(r, params, default_code)) val=string->as_int(); else if(default_code)