--- parser3/src/include/pa_common.h 2002/11/29 08:06:59 1.87 +++ parser3/src/include/pa_common.h 2003/04/11 15:00:05 1.92 @@ -1,14 +1,14 @@ /** @file Parser: commonly used functions. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_COMMON_H #define PA_COMMON_H -static const char* IDENT_COMMON_H="$Date: 2002/11/29 08:06:59 $"; +static const char* IDENT_COMMON_H="$Date: 2003/04/11 15:00:05 $"; #include "pa_pool.h" #include "pa_string.h" @@ -85,7 +85,7 @@ inline double sign(double param) { retur $content-type[$value[text/html] charset[windows-1251]] -> content-type: text/html; charset=windows-1251 */ -const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang); +const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang, bool forced); /// yields to OS for secs secs and usecs milliseconds int pa_sleep(unsigned long secs, unsigned long usecs); @@ -203,13 +203,6 @@ char *lsplit(char **string_ref,char deli char *rsplit(char *string, char delim); char *format(Pool& pool, double value, char *fmt); -#ifndef max -inline int max(int a, int b) { return a>b?a:b; } -inline int min(int a, int b){ return ab?a:b; } -inline size_t min(size_t a, size_t b){ return a