jcl-checkins-diff Mailing List for JEDI Code Library (Page 61)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2387
          http://jcl.svn.sourceforge.net/jcl/?rev=2387&view=rev
Author:   outchy
Date:     2008-06-25 12:42:08 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
fixed spurious warning reported when compiling containers.
Delphi.net and earlier Delphi complain about possible unaffected result when an exception is raised in the following try..finally..end statement:

try
  if bla then
    Result := blabla
  else
    raise blablabla.create;
finally
end;

Modified Paths:
--------------
    trunk/jcl/source/common/JclArrayLists.pas
    trunk/jcl/source/common/JclVectors.pas
    trunk/jcl/source/prototypes/containers/JclArrayLists.imp
    trunk/jcl/source/prototypes/containers/JclVectors.imp

Modified: trunk/jcl/source/common/JclArrayLists.pas
===================================================================

--- trunk/jcl/source/common/JclArrayLists.pas	2008-06-16 06:49:55 UTC (rev 2386)
+++ trunk/jcl/source/common/JclArrayLists.pas	2008-06-25 19:42:08 UTC (rev 2387)
@@ -53,6 +53,7 @@
   JclAlgorithms,
   {$ENDIF SUPPORTS_GENERICS}
   JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
+
 type
   TJclIntfArrayList = class(TJclIntfAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntfEqualityComparer,
@@ -3123,6 +3124,12 @@
 end;
 
 function TJclIntfArrayList.Delete(Index: Integer): IInterface;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: IInterface;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -3131,9 +3138,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeObject(FElementData[Index]);
@@ -3143,7 +3147,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -3751,6 +3755,12 @@
 end;
 
 function TJclAnsiStrArrayList.Delete(Index: Integer): AnsiString;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: AnsiString;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -3759,9 +3769,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := '';
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeString(FElementData[Index]);
@@ -3771,7 +3778,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -4379,6 +4386,12 @@
 end;
 
 function TJclWideStrArrayList.Delete(Index: Integer): WideString;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: WideString;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -4387,9 +4400,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := '';
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeString(FElementData[Index]);
@@ -4399,7 +4409,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -5007,6 +5017,12 @@
 end;
 
 function TJclSingleArrayList.Delete(Index: Integer): Single;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Single;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -5015,9 +5031,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeSingle(FElementData[Index]);
@@ -5027,7 +5040,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -5635,6 +5648,12 @@
 end;
 
 function TJclDoubleArrayList.Delete(Index: Integer): Double;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Double;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -5643,9 +5662,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeDouble(FElementData[Index]);
@@ -5655,7 +5671,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -6263,6 +6279,12 @@
 end;
 
 function TJclExtendedArrayList.Delete(Index: Integer): Extended;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Extended;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -6271,9 +6293,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeExtended(FElementData[Index]);
@@ -6283,7 +6302,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -6891,6 +6910,12 @@
 end;
 
 function TJclIntegerArrayList.Delete(Index: Integer): Integer;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Integer;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -6899,9 +6924,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeInteger(FElementData[Index]);
@@ -6911,7 +6933,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -7519,6 +7541,12 @@
 end;
 
 function TJclCardinalArrayList.Delete(Index: Integer): Cardinal;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Cardinal;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -7527,9 +7555,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeCardinal(FElementData[Index]);
@@ -7539,7 +7564,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -8147,6 +8172,12 @@
 end;
 
 function TJclInt64ArrayList.Delete(Index: Integer): Int64;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Int64;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -8155,9 +8186,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeInt64(FElementData[Index]);
@@ -8167,7 +8195,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -8776,6 +8804,12 @@
 end;
 
 function TJclPtrArrayList.Delete(Index: Integer): Pointer;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Pointer;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -8784,9 +8818,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreePointer(FElementData[Index]);
@@ -8796,7 +8827,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -9405,6 +9436,12 @@
 end;
 
 function TJclArrayList.Delete(Index: Integer): TObject;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: TObject;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -9413,9 +9450,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeObject(FElementData[Index]);
@@ -9425,7 +9459,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -10029,6 +10063,12 @@
 
 
 function TJclArrayList<T>.Delete(Index: Integer): T;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: T;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -10037,9 +10077,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := Default(T);
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeItem(FElementData[Index]);
@@ -10049,7 +10086,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then

Modified: trunk/jcl/source/common/JclVectors.pas
===================================================================
--- trunk/jcl/source/common/JclVectors.pas	2008-06-16 06:49:55 UTC (rev 2386)
+++ trunk/jcl/source/common/JclVectors.pas	2008-06-25 19:42:08 UTC (rev 2387)
@@ -56,6 +56,7 @@
   {$ENDIF SUPPORTS_GENERICS}
   Classes,
   JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
+
 type
   TJclIntfVector = class(TJclIntfAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntfEqualityComparer,
@@ -3065,6 +3066,12 @@
 end;
 
 function TJclIntfVector.Delete(Index: Integer): IInterface;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: IInterface;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -3073,9 +3080,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeObject(FItems[Index]);
@@ -3084,7 +3088,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -3630,6 +3634,12 @@
 end;
 
 function TJclAnsiStrVector.Delete(Index: Integer): AnsiString;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: AnsiString;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -3638,9 +3648,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := '';
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeString(FItems[Index]);
@@ -3649,7 +3656,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -4195,6 +4202,12 @@
 end;
 
 function TJclWideStrVector.Delete(Index: Integer): WideString;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: WideString;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -4203,9 +4216,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := '';
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeString(FItems[Index]);
@@ -4214,7 +4224,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -4760,6 +4770,12 @@
 end;
 
 function TJclSingleVector.Delete(Index: Integer): Single;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Single;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -4768,9 +4784,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeSingle(FItems[Index]);
@@ -4779,7 +4792,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -5325,6 +5338,12 @@
 end;
 
 function TJclDoubleVector.Delete(Index: Integer): Double;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Double;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -5333,9 +5352,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeDouble(FItems[Index]);
@@ -5344,7 +5360,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -5890,6 +5906,12 @@
 end;
 
 function TJclExtendedVector.Delete(Index: Integer): Extended;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Extended;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -5898,9 +5920,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0.0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeExtended(FItems[Index]);
@@ -5909,7 +5928,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -6455,6 +6474,12 @@
 end;
 
 function TJclIntegerVector.Delete(Index: Integer): Integer;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Integer;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -6463,9 +6488,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeInteger(FItems[Index]);
@@ -6474,7 +6496,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -7020,6 +7042,12 @@
 end;
 
 function TJclCardinalVector.Delete(Index: Integer): Cardinal;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Cardinal;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -7028,9 +7056,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeCardinal(FItems[Index]);
@@ -7039,7 +7064,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -7585,6 +7610,12 @@
 end;
 
 function TJclInt64Vector.Delete(Index: Integer): Int64;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Int64;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -7593,9 +7624,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := 0;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeInt64(FItems[Index]);
@@ -7604,7 +7632,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -8152,6 +8180,12 @@
 end;
 
 function TJclPtrVector.Delete(Index: Integer): Pointer;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: Pointer;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -8160,9 +8194,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreePointer(FItems[Index]);
@@ -8171,7 +8202,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -8718,6 +8749,12 @@
 end;
 
 function TJclVector.Delete(Index: Integer): TObject;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: TObject;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -8726,9 +8763,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := nil;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeObject(FItems[Index]);
@@ -8737,7 +8771,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then
@@ -9280,6 +9314,12 @@
 
 
 function TJclVector<T>.Delete(Index: Integer): T;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: T;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   if ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -9288,9 +9328,6 @@
     SyncReaderWriter.BeginWrite;
   try
   {$ENDIF THREADSAFE}
-    {$IFDEF CLR}
-    Result := Default(T);
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := FreeItem(FItems[Index]);
@@ -9299,7 +9336,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$IFDEF THREADSAFE}
   finally
     if FThreadSafe then

Modified: trunk/jcl/source/prototypes/containers/JclArrayLists.imp
===================================================================
--- trunk/jcl/source/prototypes/containers/JclArrayLists.imp	2008-06-16 06:49:55 UTC (rev 2386)
+++ trunk/jcl/source/prototypes/containers/JclArrayLists.imp	2008-06-25 19:42:08 UTC (rev 2387)
@@ -321,11 +321,14 @@
 
 {$JPPEXPANDMACRO CREATEEMPTYCONTAINER}
 function SELFCLASSNAME.Delete(Index: Integer): TYPENAME;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: TYPENAME;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   {$JPPEXPANDMACRO WRITEBEGIN}
-    {$IFDEF CLR}
-    Result := DEFAULTVALUE;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := RELEASERNAME(FElementData[Index]);
@@ -335,7 +338,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$JPPEXPANDMACRO WRITEEND}
 end;
 

Modified: trunk/jcl/source/prototypes/containers/JclVectors.imp
===================================================================
--- trunk/jcl/source/prototypes/containers/JclVectors.imp	2008-06-16 06:49:55 UTC (rev 2386)
+++ trunk/jcl/source/prototypes/containers/JclVectors.imp	2008-06-25 19:42:08 UTC (rev 2387)
@@ -264,11 +264,14 @@
 
 {$JPPEXPANDMACRO CREATEEMPTYCONTAINER}
 function SELFCLASSNAME.Delete(Index: Integer): TYPENAME;
+  // fix ambiguous warnings when compiled on Delphi.net and earlier versions of Delphi.win32
+  // complaining about possible unaffected result.
+  function RaiseOutOfBoundsError: TYPENAME;
+  begin
+    raise EJclOutOfBoundsError.Create;
+  end;
 begin
   {$JPPEXPANDMACRO WRITEBEGIN}
-    {$IFDEF CLR}
-    Result := DEFAULTVALUE;
-    {$ENDIF CLR}
     if (Index >= 0) and (Index < FSize) then
     begin
       Result := RELEASERNAME(FItems[Index]);
@@ -277,7 +280,7 @@
       AutoPack;
     end
     else
-      raise EJclOutOfBoundsError.Create;
+      Result := RaiseOutOfBoundsError;
   {$JPPEXPANDMACRO WRITEEND}
 end;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr (20)	May (48)	Jun (8)	Jul (23)	Aug (41)	Sep (42)	Oct (22)	Nov (17)	Dec (36)
2007	Jan (43)	Feb (42)	Mar (17)	Apr (39)	May (16)	Jun (35)	Jul (37)	Aug (47)	Sep (49)	Oct (9)	Nov (52)	Dec (37)
2008	Jan (48)	Feb (21)	Mar (7)	Apr (2)	May (5)	Jun (17)	Jul (17)	Aug (40)	Sep (58)	Oct (38)	Nov (19)	Dec (32)
2009	Jan (67)	Feb (46)	Mar (54)	Apr (34)	May (37)	Jun (52)	Jul (67)	Aug (72)	Sep (48)	Oct (35)	Nov (27)	Dec (12)
2010	Jan (56)	Feb (46)	Mar (19)	Apr (14)	May (21)	Jun (3)	Jul (13)	Aug (48)	Sep (34)	Oct (51)	Nov (16)	Dec (32)
2011	Jan (36)	Feb (14)	Mar (12)	Apr (3)	May (5)	Jun (24)	Jul (15)	Aug (30)	Sep (21)	Oct (4)	Nov (25)	Dec (23)
2012	Jan (45)	Feb (42)	Mar (19)	Apr (14)	May (13)	Jun (7)	Jul (3)	Aug (46)	Sep (21)	Oct (10)	Nov (2)	Dec
2013	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jcl-checkins-diff Mailing List for JEDI Code Library (Page 61)

jcl-checkins-diff — SVN file check-in notifications with file differences included