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

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/util/extvalue.h (modified) (5 diffs)

cpp/frams/util/extvalue.h

@@ -101 +101 @@
 #ifdef EXTVALUEUNION
 long data[(EXTVALUEUNIONSIZE+sizeof(long)-1)/sizeof(long)];
-long& idata() const {return (long&)data[0];};
+paInt& idata() const {return (paInt&)data[0];};
 double& ddata() const {return *(double*)data;};
 ExtObject& odata() const {return *(ExtObject*)data;};
@@ -107 +107 @@
 #else
 union {
-long i;
+paInt i;
 double d;
 SString *s;
 ExtObject *o;
 };
-long& idata() const {return (long&)i;};
+paInt& idata() const {return (paInt&)i;};
 double& ddata() const {return (double&)d;};
 ExtObject& odata() const {return *o;};
@@ -123 +123 @@
 ExtValue():type(TUnknown){}
 ~ExtValue() {setEmpty();}
-ExtValue(long v) {seti(v);}
+ExtValue(paInt v) {seti(v);}
 ExtValue(double v) {setd(v);}
 ExtValue(const SString &v) {sets(v);}
 ExtValue(const ExtObject &srco) {seto(srco);}
 static ExtValue invalid() {ExtValue v; v.setInvalid(); return v;}
-long compare(const ExtValue& src) const;
+int compare(const ExtValue& src) const;
 int operator==(const ExtValue& src) const;
 void operator+=(const ExtValue& src);
@@ -144 +144 @@
 ExtPType getType() {return type;}
 void *getObjectTarget(const char* classname,bool warn=true) const;
-void setInt(long v) {if (type!=TInt) setri(v); else idata()=v;}
+void setInt(paInt v) {if (type!=TInt) setri(v); else idata()=v;}
 void setDouble(double v) {if (type!=TDouble) setrd(v); else ddata()=v;}
 void setString(const SString &v) {if (type!=TString) setrs(v); else sdata()=v;}
 void setObject(const ExtObject &src) {if (type!=TObj) setro(src); else odata()=src;}
-static long getInt(const char* s);
+static paInt getInt(const char* s);
 static double getDouble(const char* s);
-long getInt() const;
+paInt getInt() const;
 double getDouble() const;
 SString getString() const;
@@ -176 +176 @@
 void setr(const ExtValue& src){setEmpty();set(src);}
 void set(const ExtValue& src);
-void setri(long v) {setEmpty();seti(v);}
+void setri(paInt v) {setEmpty();seti(v);}
 void setrd(double v) {setEmpty();setd(v);}
-void seti(long v) {type=TInt;idata()=v;}
+void seti(paInt v) {type=TInt;idata()=v;}
 void setd(double v) {type=TDouble;ddata()=v;}
 #ifdef EXTVALUEUNION