Skip to content

Commit 0887bb6

Browse files
author
delphidabbler
committed
streams:
* Added conditional compilation of units when running on XE3 or later to permit method inlining to work. git-svn-id: https://svn.code.sf.net/p/ddablib/code/trunk@1560 eed78412-d13c-44e9-9ac7-ca5071eb296d
1 parent a87e4b6 commit 0887bb6

File tree

2 files changed

+35
-14
lines changed

2 files changed

+35
-14
lines changed

Demos/IStreamWrapDemo/FmIStreamWrap.pas

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,11 @@
1010

1111
unit FmIStreamWrap;
1212

13-
interface
14-
15-
uses
16-
// Delphi
17-
ComCtrls, Menus, Buttons, StdCtrls, Controls, Classes, Forms, ActiveX;
18-
13+
{$UNDEF REQUIRES_TYPES_UNIT}
1914
{$IFDEF CONDITIONALEXPRESSIONS}
2015
{$IF CompilerVersion >= 24.0} // Delphi XE3 and later
2116
{$LEGACYIFEND ON} // NOTE: this must come before all $IFEND directives
17+
{$DEFINE REQUIRES_TYPES_UNIT}
2218
{$IFEND}
2319
{$IF CompilerVersion >= 15.0} // Delphi 7 and later
2420
{$WARN UNSAFE_CODE OFF}
@@ -27,6 +23,23 @@ interface
2723
{$IFEND}
2824
{$ENDIF}
2925

26+
interface
27+
28+
uses
29+
// Delphi
30+
{$IFDEF REQUIRES_TYPES_UNIT}
31+
System.UITypes,
32+
System.Types,
33+
{$ENDIF}
34+
ComCtrls,
35+
Menus,
36+
Buttons,
37+
StdCtrls,
38+
Controls,
39+
Classes,
40+
Forms,
41+
ActiveX;
42+
3043
type
3144
{
3245
TIStreamWrapForm:

Demos/StreamWrapDemo/FmStreamWrap.pas

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010

1111
unit FmStreamWrap;
1212

13-
interface
14-
15-
uses
16-
// Delphi
17-
StdCtrls, Controls, Classes, Forms,
18-
// delphiDabbler Stream Library
19-
PJStreamWrapper;
20-
13+
{$UNDEF REQUIRES_TYPES_UNIT}
2114
{$IFDEF CONDITIONALEXPRESSIONS}
2215
{$IF CompilerVersion >= 24.0} // Delphi XE3 and later
2316
{$LEGACYIFEND ON} // NOTE: this must come before all $IFEND directives
17+
{$DEFINE REQUIRES_TYPES_UNIT}
2418
{$IFEND}
2519
{$IF CompilerVersion >= 15.0} // Delphi 7 and later
2620
{$WARN UNSAFE_CODE OFF}
@@ -29,6 +23,20 @@ interface
2923
{$IFEND}
3024
{$ENDIF}
3125

26+
interface
27+
28+
uses
29+
// Delphi
30+
{$IFDEF REQUIRES_TYPES_UNIT}
31+
System.UITypes,
32+
{$ENDIF}
33+
StdCtrls,
34+
Controls,
35+
Classes,
36+
Forms,
37+
// delphiDabbler Stream Library
38+
PJStreamWrapper;
39+
3240
type
3341
{
3442
TStreamWrapForm:

0 commit comments

Comments
 (0)