|
From: Frank V. C. <fr...@us...> - 2000-10-23 04:05:57
|
Update of /cvsroot/corelinux/clfw/src/libs/clfw In directory slayer.i.sourceforge.net:/tmp/cvs-serv17389/src/libs/clfw Modified Files: Boolean.cpp Integer.cpp Makefile.am Number.cpp ShortInteger.cpp UnsignedInteger.cpp Added Files: SignedNumber.cpp UnsignedNumber.cpp UnsignedShortInteger.cpp Log Message: 117451 117452 ***** Error reading new file: (2, 'No such file or directory') ***** Error reading new file: (2, 'No such file or directory') ***** Error reading new file: (2, 'No such file or directory') Index: Boolean.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Boolean.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Boolean.cpp 2000/10/22 14:47:19 1.1 --- Boolean.cpp 2000/10/23 04:05:53 1.2 *************** *** 68,71 **** --- 68,73 ---- Boolean::Boolean( void ) + : + FrameworkEntity() { ; // do nothing Index: Integer.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Integer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Integer.cpp 2000/10/16 03:05:47 1.2 --- Integer.cpp 2000/10/23 04:05:53 1.3 *************** *** 26,31 **** #endif ! #if !defined(__NUMBER_HPP) ! #include <Number.hpp> #endif --- 26,31 ---- #endif ! #if !defined(__SIGNEDNUMBER_HPP) ! #include <SignedNumber.hpp> #endif *************** *** 50,54 **** OPEN_METATYPE_PARENTS( Integer ) ! DEFINE_METATYPE_PARENT( Number ) CLOSE_METATYPE_PARENT; --- 50,54 ---- OPEN_METATYPE_PARENTS( Integer ) ! DEFINE_METATYPE_PARENT( SignedNumber ) CLOSE_METATYPE_PARENT; *************** *** 72,75 **** --- 72,78 ---- Integer::Integer( void ) + : + SignedNumber(), + theValue(0) { ; // do nothing *************** *** 116,119 **** --- 119,126 ---- return ( *this ); } + + // + // Assigned value + // IntegerRef Integer::operator=( IntCref aInt ) Index: Makefile.am =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.am 2000/10/22 14:47:19 1.10 --- Makefile.am 2000/10/23 04:05:53 1.11 *************** *** 22,29 **** Boolean.cpp \ Number.cpp \ RealNumber.cpp \ Integer.cpp \ ShortInteger.cpp \ ! UnsignedInteger.cpp LIBS = --- 22,33 ---- Boolean.cpp \ Number.cpp \ + UnsignedNumber.cpp \ + SignedNumber.cpp \ RealNumber.cpp \ Integer.cpp \ ShortInteger.cpp \ ! UnsignedInteger.cpp \ ! UnsignedShortInteger.cpp ! LIBS = Index: Number.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Number.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Number.cpp 2000/10/22 14:49:16 1.3 --- Number.cpp 2000/10/23 04:05:53 1.4 *************** *** 63,66 **** --- 63,68 ---- Number::Number( void ) + : + FrameworkEntity() { ; // do nothing Index: ShortInteger.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/ShortInteger.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ShortInteger.cpp 2000/10/16 03:05:47 1.1 --- ShortInteger.cpp 2000/10/23 04:05:53 1.2 *************** *** 36,44 **** namespace corelinux { ! //! version Integer for the Integer MetaType const DwordCref version(1); ! //! meta indentifier for the Integer const UniversalIdentifier metaIdentifier --- 36,44 ---- namespace corelinux { ! //! version ShortInteger for the ShortInteger MetaType const DwordCref version(1); ! //! meta indentifier for the ShortInteger const UniversalIdentifier metaIdentifier *************** *** 47,51 **** ); ! //! The ontology describes integer as the subset of reals OPEN_METATYPE_PARENTS( ShortInteger ) --- 47,51 ---- ); ! //! The ontology describes ShortInteger as the subset Integers OPEN_METATYPE_PARENTS( ShortInteger ) *************** *** 72,75 **** --- 72,77 ---- ShortInteger::ShortInteger( void ) + : + Integer() { ; // do nothing *************** *** 94,98 **** ) const { ! return ( this == & aShortInteger ); } --- 96,100 ---- ) const { ! return ( this == &aShortInteger ); } Index: UnsignedInteger.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/UnsignedInteger.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** UnsignedInteger.cpp 2000/10/20 11:37:52 1.1 --- UnsignedInteger.cpp 2000/10/23 04:05:53 1.2 *************** *** 30,37 **** #endif ! #if !defined(__INTEGER_HPP) ! #include <Integer.hpp> #endif namespace corelinux { --- 30,38 ---- #endif ! #if !defined(__UNSIGNEDNUMBER_HPP) ! #include <UnsignedNumber.hpp> #endif + namespace corelinux { *************** *** 50,54 **** OPEN_METATYPE_PARENTS( UnsignedInteger ) ! DEFINE_METATYPE_PARENT( Integer ) CLOSE_METATYPE_PARENT; --- 51,55 ---- OPEN_METATYPE_PARENTS( UnsignedInteger ) ! DEFINE_METATYPE_PARENT( UnsignedNumber ) CLOSE_METATYPE_PARENT; *************** *** 72,75 **** --- 73,79 ---- UnsignedInteger::UnsignedInteger( void ) + : + UnsignedNumber(), + theValue( 0U ) { ; // do nothing *************** *** 103,112 **** UnsignedIntegerRef UnsignedInteger::operator= ( ! UnsignedIntegerCref aIntRef ) { ! if( this != &aIntRef ) { ! setValue( aIntRef.getValue() ); } else --- 107,116 ---- UnsignedIntegerRef UnsignedInteger::operator= ( ! UnsignedIntegerCref aUIntRef ) { ! if( this != &aUIntRef ) { ! setValue( aUIntRef.getValue() ); } else |