- removed FPC_HASINTERNALOLEVARIANT2VARIANTCAST-related checks, FPC 2.6.4

    has it

git-svn-id: trunk@31689 -

compiler/options.pas

@@ -3248,7 +3248,6 @@ begin
   def_system_macro('VER'+version_nr+'_'+release_nr+'_'+patch_nr);
 
 { Temporary defines, until things settle down }
-  def_system_macro('FPC_HASINTERNALOLEVARIANT2VARIANTCAST');
   def_system_macro('FPC_HAS_VARSETS');
   def_system_macro('FPC_HAS_VALGRINDBOOL');
   def_system_macro('FPC_HAS_STR_CURRENCY');

rtl/inc/variant.inc

@@ -543,13 +543,6 @@ operator :=(const source : variant) dest : tdatetime;{$ifdef SYSTEMINLINE}inline
   end;
 {$endif}
 
-{$ifndef FPC_HASINTERNALOLEVARIANT2VARIANTCAST}
-operator :=(const source : olevariant) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
-  begin
-    tvardata(result):=tvardata(source);
-  end;
-{$endif FPC_HASINTERNALOLEVARIANT2VARIANTCAST}
-
 operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     variantmanager.olevarfromvar(dest,source);

rtl/inc/varianth.inc

@@ -336,11 +336,6 @@ operator :=(const source : variant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$en
 operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif}
 
-{ done by the compiler now }
-{$ifndef FPC_HASINTERNALOLEVARIANT2VARIANTCAST}
-operator :=(const source : olevariant) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
-{$endif FPC_HASINTERNALOLEVARIANT2VARIANTCAST}
-
 operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 { Misc. }