浏览代码

- Removed outdated VER2_0 defines

git-svn-id: trunk@19513 -
sergei 13 年之前
父节点
当前提交
f4023ef49e
共有 2 个文件被更改,包括 0 次插入16 次删除
  1. 0 8
      rtl/inc/variant.inc
  2. 0 8
      rtl/inc/varianth.inc

+ 0 - 8
rtl/inc/variant.inc

@@ -294,14 +294,12 @@ end;
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
-{$ifndef VER2_0}
 {$ifndef FPUNONE}
 {$ifndef FPUNONE}
 Operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 Operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 begin
 begin
   VariantManager.VarFromReal(Dest,Source);
   VariantManager.VarFromReal(Dest,Source);
 end;
 end;
 {$endif}
 {$endif}
-{$endif VER2_0}
 
 
 
 
 { Misc. }
 { Misc. }
@@ -502,14 +500,12 @@ end;
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
-{$ifndef VER2_0}
 {$ifndef FPUNONE}
 {$ifndef FPUNONE}
 operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 begin
 begin
   dest:=variantmanager.vartoreal(source);
   dest:=variantmanager.vartoreal(source);
 end;
 end;
 {$endif}
 {$endif}
-{$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}
@@ -850,12 +846,10 @@ operator :=(const source : olevariant) dest : comp;{$ifdef SYSTEMINLINE}inline;{
 
 
 
 
 {$ifndef FPUNONE}
 {$ifndef FPUNONE}
-{$ifndef VER2_0}
 operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin
     dest:=variantmanager.vartoreal(variant(tvardata(source)));
     dest:=variantmanager.vartoreal(variant(tvardata(source)));
   end;
   end;
-{$endif VER2_0}
 {$endif}
 {$endif}
 
 
 { Misc. }
 { Misc. }
@@ -1021,14 +1015,12 @@ operator :=(const source : comp) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{
 {$endif SUPPORT_COMP}
 {$endif SUPPORT_COMP}
 
 
 
 
-{$ifndef VER2_0}
 {$ifndef FPUNONE}
 {$ifndef FPUNONE}
 operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
   begin
     variantmanager.varfromreal(variant(tvardata(dest)),source);
     variantmanager.varfromreal(variant(tvardata(dest)),source);
   end;
   end;
 {$endif}
 {$endif}
-{$endif VER2_0}
 
 
 
 
 { Misc. }
 { Misc. }

+ 0 - 8
rtl/inc/varianth.inc

@@ -278,9 +278,7 @@ operator :=(const source : extended) dest : variant;{$ifdef SYSTEMINLINE}inline;
 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 FPUNONE}
 {$ifndef FPUNONE}
-{$ifndef VER2_0}
 operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : real) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
-{$endif VER2_0}
 {$endif}
 {$endif}
 
 
 { Misc. }
 { Misc. }
@@ -337,9 +335,7 @@ operator :=(const source : variant) dest : extended;{$ifdef SYSTEMINLINE}inline;
 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 FPUNONE}
 {$ifndef FPUNONE}
-{$ifndef VER2_0}
 operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
-{$endif VER2_0}
 {$endif}
 {$endif}
 
 
 { done by the compiler now }
 { done by the compiler now }
@@ -431,9 +427,7 @@ operator :=(const source : olevariant) dest : extended;{$ifdef SYSTEMINLINE}inli
 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 FPUNONE}
 {$ifndef FPUNONE}
-{$ifndef VER2_0}
 operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
-{$endif VER2_0}
 {$endif}
 {$endif}
 
 
 { Misc. }
 { Misc. }
@@ -488,9 +482,7 @@ operator :=(const source : extended) dest : olevariant;{$ifdef SYSTEMINLINE}inli
 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 FPUNONE}
 {$ifndef FPUNONE}
-{$ifndef VER2_0}
 operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : real) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
-{$endif VER2_0}
 {$endif}
 {$endif}
 
 
 { Misc. }
 { Misc. }