Skip to content

remove unused defines and duplicates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xor-el merged 1 commit into from
Dec 21, 2025
Merged

remove unused defines and duplicates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr
View file
Open in desktop

This file was deleted.

24 changes: 18 additions & 6 deletions SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,22 @@ program SimpleBaseLib.Tests;
}

{$WARN DUPLICATE_CTOR_DTOR OFF}
{$IFDEF CONSOLE_TESTRUNNER}
{$APPTYPE CONSOLE}

{$IFNDEF TESTINSIGHT}
{$IFDEF CONSOLE_TESTRUNNER}
{$APPTYPE CONSOLE}
{$ENDIF}
{$ENDIF}

uses
Forms,
TestFramework,
GUITestRunner,
TextTestRunner,
{$IFDEF TESTINSIGHT}
TestInsight.DUnit,
{$ELSE}
Forms,
TestFramework,
GUITestRunner,
TextTestRunner,
{$ENDIF}
SbpBase58Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase58Alphabet.pas',
SbpIBase58Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase58Alphabet.pas',
SbpBase58 in '..\..\SimpleBaseLib\src\Bases\SbpBase58.pas',
Expand Down Expand Up @@ -54,10 +61,15 @@ uses
SimpleBaseLibTestBase in '..\src\SimpleBaseLibTestBase.pas';

begin

{$IFDEF TESTINSIGHT}
TestInsight.DUnit.RunRegisteredTests;
{$ELSE}
Application.Initialize;
if IsConsole then
TextTestRunner.RunRegisteredTests
else
GUITestRunner.RunRegisteredTests;
{$ENDIF}

end.
5 changes: 0 additions & 5 deletions SimpleBaseLib/src/Include/SimpleBaseLib.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
{$STRINGCHECKS OFF}
{$WARN DUPLICATE_CTOR_DTOR OFF}

// XE and Above
{$IF CompilerVersion >= 22.0}
{$DEFINE DELPHIXE_UP}
{$IFEND}

{$ENDIF}

{========================== Common Compiler Settings ==========================}
Expand Down
19 changes: 0 additions & 19 deletions SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException);
/// </summary>
TSimpleBaseLibByteArray = TBytes;

{$IFDEF DELPHIXE_UP}
/// <summary>
/// Represents a dynamic array of Char.
/// </summary>
TSimpleBaseLibCharArray = TArray<Char>;

/// <summary>
/// Represents a dynamic array of String.
/// </summary>
TSimpleBaseLibStringArray = TArray<String>;

/// <summary>
/// Represents a dynamic array of array of byte.
/// </summary>
TSimpleBaseLibMatrixByteArray = TArray<TSimpleBaseLibByteArray>;

{$ELSE}
/// <summary>
/// Represents a dynamic array of Char.
/// </summary>
Expand All @@ -51,8 +34,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException);
/// </summary>
TSimpleBaseLibMatrixByteArray = array of TSimpleBaseLibByteArray;

{$ENDIF DELPHIXE_UP}

implementation

{$IFDEF FPC}
Expand Down