|
From: Frank V. C. <fr...@us...> - 2000-10-16 03:05:10
|
Update of /cvsroot/corelinux/clfw/clfw In directory slayer.i.sourceforge.net:/tmp/cvs-serv1483 Modified Files: Makefile.am MetaType.hpp Added Files: ShortInteger.hpp Log Message: 116736 ShortInteger ***** 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.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.am 2000/10/14 11:49:33 1.8 --- Makefile.am 2000/10/16 03:05:07 1.9 *************** *** 20,23 **** --- 20,24 ---- RealNumber.hpp \ Integer.hpp \ + ShortInteger.hpp \ Makefile.am Index: MetaType.hpp =================================================================== RCS file: /cvsroot/corelinux/clfw/clfw/MetaType.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** MetaType.hpp 2000/10/09 12:40:11 1.11 --- MetaType.hpp 2000/10/16 03:05:07 1.12 *************** *** 107,112 **** } - - typedef void * (*PfnGet)( FrameworkEntityPtr ); typedef void (*PfnSet)( FrameworkEntityPtr, VoidPtr ); --- 107,110 ---- *************** *** 124,137 **** DECLARE_TYPE(struct _InstanceMemberDescriptor, MemberDescriptor ); ! /*! def DECLARE_INSTANCEDATA( type, name ) \brief Declare data members that object instances expose by generating accessors and mutators \arg type : the member data type ! \arg type : the member instance variable name */ #define DECLARE_INSTANCEDATA( type, dataName ) \ public: \ ! static MemberDescriptor the##dataName##Descriptor; \ type get##dataName( void ) const \ { \ --- 122,145 ---- DECLARE_TYPE(struct _InstanceMemberDescriptor, MemberDescriptor ); ! #define _DECLARE_INSTANCEDATA_STATICS(dataName) \ ! public: \ ! static MemberDescriptor the##dataName##Descriptor; \ ! static void *get##dataName##AsVPtr( FrameworkEntityPtr ); \ ! static void set##dataName##AsVPtr \ ! ( \ ! FrameworkEntityPtr , \ ! VoidPtr \ ! ); \ ! ! /*! def DECLARE_INSTANCEDATA( type, dataName ) \brief Declare data members that object instances expose by generating accessors and mutators \arg type : the member data type ! \arg dataName : the member instance variable name */ #define DECLARE_INSTANCEDATA( type, dataName ) \ public: \ ! _DECLARE_INSTANCEDATA_STATICS(dataName) \ type get##dataName( void ) const \ { \ *************** *** 150,157 **** return (VoidPtr)get##dataName##AsPointer(); \ } \ - static void *get##dataName##AsVPtr \ - ( \ - FrameworkEntityPtr \ - ); \ /** \ Mutators \ --- 158,161 ---- *************** *** 169,179 **** the##dataName = *((type *)aType); \ } \ - static void set##dataName##AsVPtr \ - ( \ - FrameworkEntityPtr , \ - VoidPtr \ - ); \ private: \ ! type the##dataName /*! --- 173,226 ---- the##dataName = *((type *)aType); \ } \ private: \ ! type the##dataName ! ! /*! def DECLARE_INSTANCEDATA_FROMBASE( type, dataName, baseType, baseClass ) ! \brief Declare data members that object instances expose by ! generating accessors and mutators ! \arg type : the member data type ! \arg dataName : the member instance variable name ! \arg baseType : the base member variable type for coercion ! \arg baseClass : the base class ! */ ! ! #define DECLARE_INSTANCEDATA_FROMBASE( type, dataName, baseType, baseClass ) \ ! public: \ ! _DECLARE_INSTANCEDATA_STATICS(dataName) \ ! type get##dataName( void ) const \ ! { \ ! return (type) baseClass::get##dataName(); \ ! } \ ! const type & get##dataName##AsReference( void ) const \ ! { \ ! return (const type &) baseClass::get##dataName##AsReference(); \ ! } \ ! const type * get##dataName##AsPointer( void ) const \ ! { \ ! return (const type *)baseClass::get##dataName##AsPointer(); \ ! } \ ! void * get##dataName##AsVoidPtr( void ) const \ ! { \ ! return baseClass::get##dataName##AsVoidPtr(); \ ! } \ ! /** \ ! Mutators \ ! */ \ ! void set##dataName( const type &aType ) \ ! { \ ! baseType btr = (baseType) aType; \ ! baseClass::set##dataName(btr); \ ! } \ ! void set##dataName##FromPointer( type *aType ) \ ! { \ ! baseType btr = (baseType) *aType; \ ! baseClass::set##dataName##FromPointer(&btr); \ ! } \ ! void set##dataName##FromVPtr( void *aType ) \ ! { \ ! baseType btr = (baseType) *((type *) aType); \ ! baseClass::set##dataName##FromVPtr((VoidPtr)&btr); \ ! } \ ! /*! |