--- parser3/src/classes/classes.h 2003/01/31 12:34:26 1.23.2.7 +++ parser3/src/classes/classes.h 2004/02/11 15:33:11 1.26 @@ -1,14 +1,14 @@ /** @file Parser: @b Methoded class decl. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef CLASSES_H #define CLASSES_H -static const char* IDENT_CLASSES_H="$Date: 2003/01/31 12:34:26 $"; +static const char * const IDENT_CLASSES_H="$Date: 2004/02/11 15:33:11 $"; // include @@ -43,16 +43,15 @@ public: // Methoded public: // usage Methoded(const char* aname, VStateless_class* abase=0): - VStateless_class(StringPtr(new String(aname)), abase) { + VStateless_class(new String(aname), abase) { } void register_directly_used(Request& r); }; -DECLARE_OBJECT_PTR(Methoded); /// all Methoded registered here in autogenerated classes.C -class Methoded_array: public Array { +class Methoded_array: public Array { public: Methoded_array(); @@ -65,6 +64,14 @@ public: // Methoded for_each-es void register_directly_used(Request& r); }; -extern Methoded_array methoded_array; +// globals + +Methoded_array& methoded_array(); + +// defines + +#define DECLARE_CLASS_VAR(name, self, base) \ + Methoded* name##_class=self; \ + Methoded* name##_base_class=base #endif