Browse Source

* fixed another problem caused by yesterdays real change

git-svn-id: trunk@4644 -
florian 19 years ago
parent
commit
8b841e9514
2 changed files with 43 additions and 1 deletions
  1. 31 1
      rtl/inc/variant.inc
  2. 12 0
      rtl/inc/varianth.inc

+ 31 - 1
rtl/inc/variant.inc

@@ -290,6 +290,14 @@ end;
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
+{$ifndef VER2_0}
+Operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
+begin
+  VariantManager.VarFromReal(Dest,Source);
+end;
+{$endif VER2_0}
+
+
 { Misc. }
 { Misc. }
 operator :=(const source : currency) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : currency) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin
@@ -307,7 +315,7 @@ operator :=(const source : terror) dest : variant;{$ifdef SYSTEMINLINE}inline;{$
   begin
   begin
     Variantmanager.varfromInt(Dest,Source,-sizeof(terror));
     Variantmanager.varfromInt(Dest,Source,-sizeof(terror));
   end;
   end;
-  
+
 {**********************************************************************
 {**********************************************************************
                        from Variant assignments
                        from Variant assignments
  **********************************************************************}
  **********************************************************************}
@@ -468,6 +476,13 @@ end;
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
+{$ifndef VER2_0}
+operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
+begin
+  dest:=comp(variantmanager.vartoreal(source));
+end;
+{$endif VER2_0}
+
 { Misc. }
 { Misc. }
 operator :=(const source : variant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin
@@ -772,6 +787,13 @@ operator :=(const source : olevariant) dest : comp;{$ifdef SYSTEMINLINE}inline;{
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
+{$ifndef VER2_0}
+operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
+  begin
+    dest:=variantmanager.vartoreal(variant(tvardata(source)));
+  end;
+{$endif VER2_0}
+
 { Misc. }
 { Misc. }
 operator :=(const source : olevariant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin
@@ -925,6 +947,14 @@ operator :=(const source : comp) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
+{$ifndef VER2_0}
+operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
+  begin
+    variantmanager.varfromreal(variant(tvardata(dest)),source);
+  end;
+{$endif VER2_0}
+
+
 { Misc. }
 { Misc. }
 operator :=(const source : currency) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : currency) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin

+ 12 - 0
rtl/inc/varianth.inc

@@ -249,6 +249,9 @@ operator :=(const source : extended) dest : variant;{$ifdef SYSTEMINLINE}inline;
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
 operator :=(const source : comp) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : comp) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
+{$ifndef VER2_0}
+operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
+{$endif VER2_0}
 
 
 { Misc. }
 { Misc. }
 operator :=(const source : currency) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : currency) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
@@ -296,6 +299,9 @@ operator :=(const source : variant) dest : extended;{$ifdef SYSTEMINLINE}inline;
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
 operator :=(const source : variant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
+{$ifndef VER2_0}
+operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
+{$endif VER2_0}
 
 
 operator :=(const source : olevariant) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
@@ -374,6 +380,9 @@ operator :=(const source : olevariant) dest : extended;{$ifdef SYSTEMINLINE}inli
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
 operator :=(const source : olevariant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
+{$ifndef VER2_0}
+operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
+{$endif VER2_0}
 
 
 { Misc. }
 { Misc. }
 operator :=(const source : olevariant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
@@ -421,6 +430,9 @@ operator :=(const source : extended) dest : olevariant;{$ifdef SYSTEMINLINE}inli
 {$ifdef SUPPORT_COMP}
 {$ifdef SUPPORT_COMP}
 operator :=(const source : comp) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : comp) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
+{$ifndef VER2_0}
+operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
+{$endif VER2_0}
 
 
 { Misc. }
 { Misc. }
 operator :=(const source : currency) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : currency) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}