Changeset 247 for cpp/frams/util/extvalue.cpp
- Timestamp:
- 11/07/14 17:51:01 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/util/extvalue.cpp
r228 r247 281 281 } 282 282 283 static long longsign(longx)283 static int longsign(paInt x) 284 284 { 285 285 if (x<0) return -1; … … 288 288 } 289 289 290 static longcompareNull(const ExtValue& v)290 static int compareNull(const ExtValue& v) 291 291 { 292 292 switch(v.type) … … 299 299 } 300 300 301 longExtValue::compare(const ExtValue& src) const302 { 303 if ( type==TUnknown)301 int ExtValue::compare(const ExtValue& src) const 302 { 303 if (isNull()) 304 304 return compareNull(src); 305 else if (src. type==TUnknown)305 else if (src.isNull()) 306 306 return compareNull(*this); 307 307 switch(type) … … 309 309 case TInt: 310 310 { 311 longt=src.getInt();311 paInt t=src.getInt(); 312 312 if (idata()>0) 313 313 {if (t>0) return longsign(idata()-t); else return +1;} … … 545 545 if (args.finished() && (type!=0) && (type!='%')) 546 546 { 547 ret+=fmt.substr( curr-begin);547 ret+=fmt.substr((int)(curr-begin)); 548 548 break; 549 549 } 550 SString sub=fmt.substr( curr-begin,next-curr);550 SString sub=fmt.substr((int)(curr-begin),(int)(next-curr)); 551 551 switch(type) 552 552 { … … 601 601 } 602 602 603 longExtValue::getInt(const char* s)603 paInt ExtValue::getInt(const char* s) 604 604 { 605 605 if ((s[0]=='0')&&(s[1]=='x')) 606 606 { 607 longval;607 paInt val; 608 608 sscanf(s+2,"%lx",&val); 609 609 return val; … … 612 612 { 613 613 if (strchr(s,'e')||(strchr(s,'E'))) 614 return ( long)atof(s);614 return (paInt)atof(s); 615 615 else 616 return ato l(s);616 return atoi(s); 617 617 } 618 618 } … … 622 622 if ((s[0]=='0')&&(s[1]=='x')) 623 623 { 624 longval;624 paInt val; 625 625 sscanf(s+2,"%lx",&val); 626 626 return val; … … 630 630 } 631 631 632 longExtValue::getInt() const632 paInt ExtValue::getInt() const 633 633 { 634 634 switch(type) … … 639 639 case TObj: 640 640 FMprintf("ExtValue","getInt",FMLV_WARN,"Getting integer value from object reference (%s)",(const char*)getString()); 641 return ( long)odata().param;641 return (paInt)(intptr_t)odata().param; 642 642 default:; 643 643 } … … 654 654 case TObj: 655 655 FMprintf("ExtValue","getDouble",FMLV_WARN,"Getting floating point value from object reference (%s)",(const char*)getString()); 656 return (double)( long)odata().param;656 return (double)(intptr_t)odata().param; 657 657 default:; 658 658 } … … 732 732 else 733 733 { 734 setInt(ato l(in));734 setInt(atoi(in)); 735 735 return p; 736 736 } … … 769 769 { 770 770 ret=skipQuoteString(in+1,NULL); 771 SString s(in+1, ret-(in+1));771 SString s(in+1,(int)(ret-(in+1))); 772 772 sstringUnquote(s); 773 773 setString(s); … … 864 864 else if ((ret=skipWord(in))&&(ret!=in)) 865 865 { 866 SString clsname(in, ret-in);866 SString clsname(in,(int)(ret-in)); 867 867 ExtValue tmp; 868 868 ret=tmp.deserialize(ret); … … 929 929 ExtValue ExtValue::getExtType() 930 930 { 931 if (getType()!=TObj) return ExtValue(( long)getType());931 if (getType()!=TObj) return ExtValue((paInt)getType()); 932 932 ExtObject& o=odata(); 933 933 return ExtValue(SString(o.isEmpty()?"":o.interfaceName()));
Note: See TracChangeset
for help on using the changeset viewer.