paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 20:39:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- removed FPC_HASINTERNALOLEVARIANT2VARIANTCAST-related checks, FPC 2.6.4

Browse Source 
has it

git-svn-id: trunk@31689 -
This commit is contained in:
Jonas Maebe 2015-09-15 11:51:38 +00:00
parent da6382db2a
commit 858fd37483
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/options.pas
View File

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

7
rtl/inc/variant.inc
View File

@ -543,13 +543,6 @@ operator :=(const source : variant) dest : tdatetime;{$ifdef SYSTEMINLINE}inline
end; end;
{$endif} {$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} operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
begin begin
variantmanager.olevarfromvar(dest,source); variantmanager.olevarfromvar(dest,source);

5
rtl/inc/varianth.inc
View File

@ -336,11 +336,6 @@ operator :=(const source : variant) dest : comp;{$ifdef SYSTEMINLINE}inline;{$en
operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif} operator :=(const source : variant) dest : real;{$ifdef SYSTEMINLINE}inline;{$endif}
{$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} operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
{ Misc. } { Misc. }