|
From: Frank V. C. <fr...@us...> - 2000-10-01 15:56:26
|
Update of /cvsroot/corelinux/clfw/clfw In directory slayer.i.sourceforge.net:/tmp/cvs-serv2122/clfw Modified Files: Makefile.am MetaType.hpp Added Files: UniversalIdentifier.hpp Log Message: 113427 Support for MetaClass ***** Error reading new file: (2, 'No such file or directory') Index: Makefile.am =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.am 2000/09/26 11:21:11 1.4 --- Makefile.am 2000/10/01 15:56:21 1.5 *************** *** 14,17 **** --- 14,18 ---- include_HEADERS = ClfwCommon.hpp \ + UniversalIdentifier.hpp \ MetaType.hpp \ Makefile.am Index: MetaType.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/MetaType.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MetaType.hpp 2000/09/26 11:21:11 1.2 --- MetaType.hpp 2000/10/01 15:56:21 1.3 *************** *** 26,29 **** --- 26,33 ---- #endif + #if !defined(__UNIVERSALIDENTIFIER_HPP) + #include <UniversalIdentifier.hpp> + #endif + namespace corelinux { *************** *** 31,71 **** DECLARE_CLASS( Entity ); - #define DECLARE_CASTDOWN(classname) \ - static classname& castdown(Entity& p) \ - { \ - return (classname&)p; \ - } \ - static const classname& castdown(const Entity& p) \ - { \ - return (const classname&)p; \ - } \ - static classname* castdown(Entity* p) \ - { \ - return (classname*)p; \ - } \ - static const classname* castdown(const Entity* p) \ - { \ - return (const classname*)p; \ - } - - #define DECLARE_CASTDOWN_MI(classname) \ - static classname& castdown(Entity& p) \ - { \ - return *(classname*)(&p ? p._safe_castdown(*desc()) : 0); \ - } \ - static const classname& castdown(const Entity& p) \ - { \ - return *(const classname*)(&p ? p._safe_castdown(*desc()) : 0); \ - } \ - static classname* castdown(Entity* p) \ - { \ - return (classname*)(p ? p->_safe_castdown(*desc()) : 0); \ - } \ - static const classname* castdown(const Entity* p) \ - { \ - return (const classname*)(p ? p->_safe_castdown(*desc()) : 0); \ - } - - DECLARE_CLASS( MetaType ); --- 35,38 ---- *************** *** 95,99 **** ! bool isTypeOf( MetaTypeCptr ) throw ( Assertion ); protected: --- 62,66 ---- ! bool isTypeOf( MetaTypeCptr ) const throw ( Assertion ); protected: *************** *** 101,106 **** --- 68,78 ---- MetaType( MetaTypeCref ); + protected: + + private: + MetaTypeCptr *const theBaseClasses; + CharCptr theName; }; |