Merge pull request #231 from Saxos-Simone/master

Fix "fsl_base.pas" conditional defines: IFOPT D+
HealthIntersections · Mar 5, 2024 · b817391 · b817391
2 parents 0f03df3 + 877fc40
commit b817391
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/library/cda/cda_writer.pas b/library/cda/cda_writer.pas
@@ -961,7 +961,7 @@ procedure TCDAWriter.WriteCDA(oXml: TXmlBuilder; oDoc: TcdaClinicalDocument);
  if (oDT is Tv3PQ) Then
  WritePQ(sPath, oXml, sName, oDT as Tv3PQ, bOptional)
  Else if (oDT is Tv3CD) Then
- WriteCD(sPath, oXml, sName, oDT as Tv3CD, bOptional, true)
+ WriteCD(sPath, oXml, sName, oDT as Tv3CD, bOptional)
  Else if (oDT is Tv3BL) Then
  WriteBL(sPath, oXml, sName, oDT as Tv3BL, bOptional)
  Else if (oDT is Tv3CS) Then

diff --git a/library/fsl/fsl_base.pas b/library/fsl/fsl_base.pas
@@ -1207,7 +1207,9 @@ procedure TFslObject.Free;
  clsName := 'n/a';
  nmCls := 'n/a';
  try
+ {$IFOPT D+}
  nmCls := FNamedClass;
+ {$ENDIF}
  except
  nmCls := '??';
  end;
@@ -1523,7 +1525,9 @@ function TFslObject.debugInfo: String;
 
 procedure TFslObject.updateDebugInfo;
 begin
+ {$IFOPT D+}
  FDebugInfo := debugInfo;
+ {$ENDIF}
 end;
 
 function TFslObject.ObjectCrossesThreads: boolean;
@@ -1566,7 +1570,7 @@ function TFslObject.updatedDebugInfo: String;
  updateDebugInfo;
  except
  end;
- result := FDebugInfo;
+ result := {$IFOPT D+}FDebugInfo{$ELSE}''{$ENDIF};
 end;
 
 function TFslObject.CheckCondition(bCorrect: Boolean; const sMethod, sMessage: String): Boolean;