--- parser3/src/classes/classes.C 2001/09/21 14:46:09 1.8 +++ parser3/src/classes/classes.C 2003/01/31 12:34:25 1.18.2.2 @@ -1,11 +1,11 @@ /** @file Parser: @b Methoded and Methoded_array classes. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char *RCSId="$Id: classes.C,v 1.8 2001/09/21 14:46:09 parser Exp $"; + +static const char* IDENT_CLASSES_C="$Date: 2003/01/31 12:34:25 $"; #include "classes.h" #include "pa_request.h" @@ -21,18 +21,18 @@ void Methoded::register_directly_used(Re // global variable -Methoded_array *methoded_array; +Methoded_array methoded_array; // methods -Methoded_array::Methoded_array(Pool& apool) : Array(apool) { +Methoded_array::Methoded_array() { # include "classes.inc" } static void configure_admin_one(Array::Item *value, void *info) { Request& r=*static_cast(info); - Methoded *methoded=static_cast(value); - methoded->configure_admin(r); + if(Methoded *methoded=static_cast(value)) + methoded->configure_admin(r); } void Methoded_array::configure_admin(Request& r) { @@ -58,9 +58,3 @@ static void register_one(Array::Item *va void Methoded_array::register_directly_used(Request& r) { for_each(register_one, &r); } - -// creator - -void init_methoded_array(Pool& pool) { - methoded_array=new(pool) Methoded_array(pool); -}