--- parser3/src/classes/classes.h 2009/08/08 13:30:20 1.32 +++ parser3/src/classes/classes.h 2016/04/01 16:27:31 1.37 @@ -1,14 +1,14 @@ /** @file Parser: @b Methoded class decl. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef CLASSES_H #define CLASSES_H -static const char * const IDENT_CLASSES_H="$Date: 2009/08/08 13:30:20 $"; +#define IDENT_CLASSES_H "$Id: classes.h,v 1.37 2016/04/01 16:27:31 moko Exp $" // include @@ -26,7 +26,7 @@ public: // Methoded if not - global variable with Methoded descendant is used in VStateless_class parameter */ - virtual bool used_directly() =0; + virtual bool used_directly() { return true; } /// use this method to read parameters from root "auto.p"; access r.main_class virtual void configure_admin(Request& ) {} /// use this method to read parameters from 'MAIN' class; access r.main_class @@ -36,9 +36,7 @@ public: // Methoded public: // usage - Methoded(const char* aname, VStateless_class* abase=0): - VStateless_class(new String(aname), abase) { - } + Methoded(const char* aname, VStateless_class* abase=0): VStateless_class(aname, abase) {} void register_directly_used(Request& r); @@ -64,8 +62,7 @@ Methoded_array& methoded_array(); // defines -#define DECLARE_CLASS_VAR(name, self, base) \ - Methoded* name##_class=self; \ - Methoded* name##_base_class=base +#define DECLARE_CLASS_VAR(name, self) \ + Methoded* name##_class=self #endif