--- parser3/src/classes/classes.h 2003/02/26 11:29:54 1.23.2.9 +++ parser3/src/classes/classes.h 2005/07/26 12:43:05 1.28 @@ -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/02/26 11:29:54 $"; +static const char * const IDENT_CLASSES_H="$Date: 2005/07/26 12:43:05 $"; // include @@ -21,7 +21,7 @@ static const char* IDENT_CLASSES_H="$Dat class Methoded: public VStateless_class { public: // Value - override bool put_element(const String& /*name*/, Value * /*value*/, bool /*replace*/) { + override const Junction* put_element(const String& /*name*/, Value * /*value*/, bool /*replace*/) { return false; // fewer useless Exceptions } @@ -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(); @@ -64,7 +63,6 @@ public: // Methoded for_each-es /// @see Methoded::register_directly_used void register_directly_used(Request& r); }; -DECLARE_OBJECT_PTR(Methoded_array); // globals @@ -73,7 +71,7 @@ Methoded_array& methoded_array(); // defines #define DECLARE_CLASS_VAR(name, self, base) \ - MethodedPtr name##_class(self); \ - MethodedPtr name##_base_class(base) + Methoded* name##_class=self; \ + Methoded* name##_base_class=base #endif