summaryrefslogtreecommitdiff
path: root/src/core/xbbcd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/xbbcd.cpp')
-rwxr-xr-xsrc/core/xbbcd.cpp39
1 files changed, 4 insertions, 35 deletions
diff --git a/src/core/xbbcd.cpp b/src/core/xbbcd.cpp
index 4855e80..ff64110 100755
--- a/src/core/xbbcd.cpp
+++ b/src/core/xbbcd.cpp
@@ -142,37 +142,6 @@ void xbBcd::StringToBcd( const xbString &sIn )
if( bSign )
bcd.cEncDigits = bcd.cEncDigits | 0x80;
-
-/*
- std::cout << "num in = " << sIn.Str() << "\n";
- unsigned char bW[12];
- memcpy( bW, &bcd, 12 );
- std::cout << "bx ";
- for( int i = 0; i < 12; i++ ){
- bcdBitDump( bW[i] );
- std::cout << " ";
- }
- std::cout << "\n";
-
- unsigned char cSign = bcd.cEncDigits >> 7;
- std::cout << "bs ";
- bcdBitDump( cSign );
- std::cout << "\n";
-
- std::cout << "test = ";
- bcdBitDump( cEdc );
- std::cout << " ";
- bcdBitDump( GetEncDigitsNoSign() );
- std::cout << "\n";
- bcdBitDump( bcd.cEncDigits );
-
- unsigned char c = bcd.cEncDigits;
- c = c << 1;
- c = c >> 3;
- std::cout << " ";
- bcdBitDump( c );
- std::cout << "\n";
-*/
}
/***********************************************************************/
void xbBcd::ToChar( char * cOut ){
@@ -268,20 +237,20 @@ xbInt16 xbBcd::Compare( const xbBcd &bcdIn ){
// if( bcd.Sign != bcdIn.GetSign() ){
// bcd.Sign > 0 ? iRc = -1 : iRc = 1;
- if( (bcd.cEncDigits >> 7 ) != bcdIn.GetSign() ){
+ if( (unsigned)(bcd.cEncDigits >> 7 ) != bcdIn.GetSign() ){
(bcd.cEncDigits >> 7 ) > 0 ? iRc = -1 : iRc = 1;
return iRc;
}
- if( bcd.cSigDigits != bcdIn.GetSigDigits()){
+ if( (unsigned) bcd.cSigDigits != bcdIn.GetSigDigits()){
// if( !bcd.Sign ){ // positive numbers
if( !(bcd.cEncDigits >> 7 )){ // positive numbers
- if( bcd.cSigDigits > bcdIn.GetSigDigits())
+ if( (unsigned) bcd.cSigDigits > bcdIn.GetSigDigits())
return 1;
else
return -1;
} else { // negative numbers
- if( bcd.cSigDigits > bcdIn.GetSigDigits())
+ if( (unsigned) bcd.cSigDigits > bcdIn.GetSigDigits())
return -1;
else
return 1;