Delphi compile fixes

HealthIntersections · Mar 10, 2024 · 26172a4 · 26172a4
1 parent f0573c3
commit 26172a4
Show file tree

Hide file tree

Showing 12 changed files with 1,555 additions and 1,550 deletions.
diff --git a/library/fhir2/fhir2_profiles.pas b/library/fhir2/fhir2_profiles.pas
@@ -136,7 +136,7 @@ TBaseWorkerContextR2 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir3/fhir3_profiles.pas b/library/fhir3/fhir3_profiles.pas
@@ -136,7 +136,7 @@ TBaseWorkerContextR3 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir4/fhir4_profiles.pas b/library/fhir4/fhir4_profiles.pas
@@ -139,7 +139,7 @@ TBaseWorkerContextR4 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir4b/fhir4b_profiles.pas b/library/fhir4b/fhir4b_profiles.pas
@@ -139,7 +139,7 @@ TBaseWorkerContextR4B = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fhir5/fhir5_profiles.pas b/library/fhir5/fhir5_profiles.pas
@@ -138,7 +138,7 @@ TBaseWorkerContextR5 = class abstract (TFHIRWorkerContext)
  procedure seeResource(res : TFHIRResourceV); overload; override;
  procedure seeResource(res : TFHIRResourceProxyV); overload; override;
  procedure dropResource(rtype, id : string); override;
- procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload;
+ procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override;
  procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual;
  procedure LoadFromDefinitions(filename : string);
  procedure LoadFromFolder(folder : string);

diff --git a/library/fsl/fsl_base.pas b/library/fsl/fsl_base.pas
@@ -1065,7 +1065,7 @@ constructor TFslObject.Create;
  {$IFOPT C+}
  isNil := t.firstObject = nil;
  if not (isNil = (t.count = 0)) then
- handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil, 'Nil', 'not nil')+' and count = '+inttostr(t.count)+' (create)');
+ handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil{$IFDEF FPC}, 'Nil', 'not nil'{$ENDIF})+' and count = '+inttostr(t.count)+' (create)');
  {$ENDIF}
 
  inc(t.count);
@@ -1157,7 +1157,7 @@ destructor TFslObject.Destroy;
  {$IFOPT C+}
  isNil := t.firstObject = nil;
  if not (isNil = (t.count = 0)) then
- handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil, 'Nil', 'not nil')+' and count = '+inttostr(t.count)+' (destroy)');
+ handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil{$IFDEF FPC}, 'Nil', 'not nil'{$ENDIF})+' and count = '+inttostr(t.count)+' (destroy)');
  {$ENDIF}
  finally
  LeaveCriticalSection(GLock);

diff --git a/library/fsl/fsl_logging.pas b/library/fsl/fsl_logging.pas
@@ -574,14 +574,12 @@ function OSMem : UInt64;
 function TLogging.InternalMem : UInt64;
 {$IFDEF DELPHI}
 var
- st : TMemoryManagerUsageSummary;
-{$ELSE}
- //hs : TFPCHeapStatus;
+ st : THeapStatus;
 {$ENDIF}
 begin
 {$IFDEF DELPHI}
- GetMemoryManagerUsageSummary(st);
- result := st.AllocatedBytes + st.OverheadBytes;
+ st := GetHeapStatus;
+ result := st.TotalAllocated + st.Overhead;
 {$ELSE}
  result := TFPCMemoryManagerTracker.totalMemory;
 {$ENDIF}

diff --git a/server/FHIRServer.dpr b/server/FHIRServer.dpr
@@ -570,7 +570,8 @@ uses
  tx_omop in 'tx\tx_omop.pas',
  fhir4_ips in '..\library\fhir4\fhir4_ips.pas',
  fdb_fts in '..\library\fdb\fdb_fts.pas',
- tests_cpt in 'tests\tests_cpt.pas';
+ tests_cpt in 'tests\tests_cpt.pas',
+ fsl_cpu in '..\library\fsl\fsl_cpu.pas';
 
 begin
  ExecuteFhirServer(TCommandLineParameters.Create);