|
From: Frank V. C. <fr...@us...> - 2000-10-23 04:05:56
|
Update of /cvsroot/corelinux/clfw/src/testdrivers/exf1 In directory slayer.i.sourceforge.net:/tmp/cvs-serv17389/src/testdrivers/exf1 Modified Files: examp1.cpp Log Message: 117451 117452 Index: examp1.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/testdrivers/exf1/examp1.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** examp1.cpp 2000/10/22 14:49:16 1.12 --- examp1.cpp 2000/10/23 04:05:53 1.13 *************** *** 49,58 **** #endif #if !defined(__INTEGER_HPP) #include <clfw/Integer.hpp> #endif ! #if !defined(__SHORTINTEGER_HPP) ! #include <clfw/ShortInteger.hpp> #endif --- 49,62 ---- #endif + #if !defined(__SHORTINTEGER_HPP) + #include <clfw/ShortInteger.hpp> + #endif + #if !defined(__INTEGER_HPP) #include <clfw/Integer.hpp> #endif ! #if !defined(__UNSIGNEDSHORTINTEGER_HPP) ! #include <clfw/UnsignedShortInteger.hpp> #endif *************** *** 126,136 **** { // ! // Becuase the root is abstract, we can't allocate it, ! // but we can reason with it // dumpMetaTypeInformation( FrameworkEntity::getTypeDescriptor() ); dumpMetaTypeInformation( Number::getTypeDescriptor() ); ! dumpMetaTypeInformation( Boolean::getTypeDescriptor() ); // --- 130,141 ---- { // ! // Because the root (and a number of support classes) are abstract, ! // we can't allocate them, but we can reason with them // dumpMetaTypeInformation( FrameworkEntity::getTypeDescriptor() ); dumpMetaTypeInformation( Number::getTypeDescriptor() ); ! dumpMetaTypeInformation( UnsignedNumber::getTypeDescriptor() ); ! dumpMetaTypeInformation( SignedNumber::getTypeDescriptor() ); // *************** *** 154,158 **** setValue<Short>("Value",3,aShort); dumpTypeInformation( aShort ); ! cout << "Value of aInteger = " << getValue<Short>("Value",aShort) << endl; ShortInteger::destroy( aShort ); --- 159,163 ---- setValue<Short>("Value",3,aShort); dumpTypeInformation( aShort ); ! cout << "Value of aShort = " << getValue<Short>("Value",aShort) << endl; ShortInteger::destroy( aShort ); *************** *** 161,175 **** UnsignedIntegerPtr aUnsigned = new UnsignedInteger; ! setValue<UnsignedInt> ! ( ! "Value", ! (UnsignedInt) -(aInteger->getValue()), ! aUnsigned ! ); dumpTypeInformation( aUnsigned ); ! cout << "Value of aInteger = " << getValue<UnsignedInt>("Value",aUnsigned) << endl; delete aUnsigned; } catch( AssertionRef aAssert ) --- 166,182 ---- UnsignedIntegerPtr aUnsigned = new UnsignedInteger; ! setValue<UnsignedInt>( "Value",(UnsignedInt)-1,aUnsigned ); dumpTypeInformation( aUnsigned ); ! cout << "Value of aUnsigned = " << getValue<UnsignedInt>("Value",aUnsigned) << endl; delete aUnsigned; + UnsignedShortIntegerPtr aUnsignedShort = new UnsignedShortInteger; + setValue<Word>( "Value",(Word)-2,aUnsignedShort); + dumpTypeInformation( aUnsignedShort ); + cout << "Value of aUnsignedShort = " + << getValue<UnsignedInt>("Value",aUnsigned) << endl; + delete aUnsignedShort; + } catch( AssertionRef aAssert ) *************** *** 214,217 **** --- 221,236 ---- ( aMTPtr->isAbstractType() ? "true" : "false" ) << endl; + + if( aMTPtr->isAbstractType() == false ) + { + AllocatorPtr aAPtr( aMTPtr->getAllocator() ); + cout + << "number allocs = " << aAPtr->getAllocateCount() << endl + << "number deallocs = " << aAPtr->getDeallocateCount() << endl; + } + else + { + ; // do nothing + } // |