From 858fd37483337e99ea5126882568dfd3b3fee534 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Tue, 15 Sep 2015 11:51:38 +0000
Subject: [PATCH]   - removed FPC_HASINTERNALOLEVARIANT2VARIANTCAST-related
 checks, FPC 2.6.4     has it

git-svn-id: trunk@31689 -
---
 compiler/options.pas | 1 -
 rtl/inc/variant.inc  | 7 -------
 rtl/inc/varianth.inc | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/compiler/options.pas b/compiler/options.pas
index 82212eb631..8ad87641b7 100644
--- a/compiler/options.pas
+++ b/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');
diff --git a/rtl/inc/variant.inc b/rtl/inc/variant.inc
index d39eaf1437..840750bd96 100644
--- a/rtl/inc/variant.inc
+++ b/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);
diff --git a/rtl/inc/varianth.inc b/rtl/inc/varianth.inc
index 1fc2ae7e85..91fa75cf8a 100644
--- a/rtl/inc/varianth.inc
+++ b/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. }