Changeset 247 for cpp/frams/util/extvalue.cpp

Timestamp:

11/07/14 17:51:01 (9 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

File:

• cpp/frams/util/extvalue.cpp (modified) (15 diffs)

cpp/frams/util/extvalue.cpp

@@ -281 +281 @@
 }
 
-static long longsign(long x)
+static int longsign(paInt x)
 {
 if (x<0) return -1;
@@ -288 +288 @@
 }
 
-static long compareNull(const ExtValue& v)
+static int compareNull(const ExtValue& v)
 {
 switch(v.type)
@@ -299 +299 @@
 }
 
-long ExtValue::compare(const ExtValue& src) const
-{
-if (type==TUnknown)
+int ExtValue::compare(const ExtValue& src) const
+{
+if (isNull())
         return compareNull(src);
-else if (src.type==TUnknown)
+else if (src.isNull())
         return compareNull(*this);
 switch(type)
@@ -309 +309 @@
         case TInt:
         {
-        long t=src.getInt();
+        paInt t=src.getInt();
         if (idata()>0)
                 {if (t>0) return longsign(idata()-t); else return +1;}
@@ -545 +545 @@
         if (args.finished() && (type!=0) && (type!='%'))
                 {
-                ret+=fmt.substr(curr-begin);
+                ret+=fmt.substr((int)(curr-begin));
                 break;
                 }
-        SString sub=fmt.substr(curr-begin,next-curr);
+        SString sub=fmt.substr((int)(curr-begin),(int)(next-curr));
         switch(type)
                 {
@@ -601 +601 @@
 }
 
-long ExtValue::getInt(const char* s)
+paInt ExtValue::getInt(const char* s)
 {
 if ((s[0]=='0')&&(s[1]=='x'))
         {
-        long val;
+        paInt val;
         sscanf(s+2,"%lx",&val);
         return val;
@@ -612 +612 @@
         {
         if (strchr(s,'e')||(strchr(s,'E')))
-                return (long)atof(s);
+                return (paInt)atof(s);
         else
-                return atol(s);
+                return atoi(s);
         }
 }
@@ -622 +622 @@
 if ((s[0]=='0')&&(s[1]=='x'))
         {
-        long val;
+        paInt val;
         sscanf(s+2,"%lx",&val);
         return val;
@@ -630 +630 @@
 }
 
-long ExtValue::getInt() const
+paInt ExtValue::getInt() const
 {
 switch(type)
@@ -639 +639 @@
         case TObj:
                 FMprintf("ExtValue","getInt",FMLV_WARN,"Getting integer value from object reference (%s)",(const char*)getString());
-                return (long)odata().param;
+                return (paInt)(intptr_t)odata().param;
         default:;
         }
@@ -654 +654 @@
         case TObj:
                 FMprintf("ExtValue","getDouble",FMLV_WARN,"Getting floating point value from object reference (%s)",(const char*)getString());
-                return (double)(long)odata().param;
+                return (double)(intptr_t)odata().param;
         default:;
         }
@@ -732 +732 @@
         else
                 {
-                setInt(atol(in));
+                setInt(atoi(in));
                 return p;
                 }
@@ -769 +769 @@
         {
         ret=skipQuoteString(in+1,NULL);
-        SString s(in+1,ret-(in+1));
+        SString s(in+1,(int)(ret-(in+1)));
         sstringUnquote(s);
         setString(s);
@@ -864 +864 @@
 else if ((ret=skipWord(in))&&(ret!=in))
         {
-        SString clsname(in,ret-in);
+        SString clsname(in,(int)(ret-in));
         ExtValue tmp;
         ret=tmp.deserialize(ret);
@@ -929 +929 @@
 ExtValue ExtValue::getExtType()
 {
-if (getType()!=TObj) return ExtValue((long)getType());
+if (getType()!=TObj) return ExtValue((paInt)getType());
 ExtObject& o=odata();
 return ExtValue(SString(o.isEmpty()?"":o.interfaceName()));