--- Merging r14989 into '.':

U    rtl/haiku/baseunix.pp
--- Merging r14990 into '.':
U    rtl/beos/baseunix.pp
--- Merging r15012 into '.':
U    rtl/objpas/classes/collect.inc
U    rtl/objpas/classes/classesh.inc

# revisions: 14989,14990,15012
------------------------------------------------------------------------
r14989 | olivier | 2010-03-07 03:53:33 +0100 (Sun, 07 Mar 2010) | 2 lines
Changed paths:
   M /trunk/rtl/haiku/baseunix.pp

* Active out support using $modeswitch under Haiku after r14965

------------------------------------------------------------------------
------------------------------------------------------------------------
r14990 | olivier | 2010-03-07 03:55:47 +0100 (Sun, 07 Mar 2010) | 2 lines
Changed paths:
   M /trunk/rtl/beos/baseunix.pp

* Active out support using $modeswitch under BeOS after r14965

------------------------------------------------------------------------
------------------------------------------------------------------------
r15012 | michael | 2010-03-14 11:25:32 +0100 (Sun, 14 Mar 2010) | 1 line
Changed paths:
   M /trunk/rtl/objpas/classes/classesh.inc
   M /trunk/rtl/objpas/classes/collect.inc

* Added Exchange to TCollection. Bug ID #15517
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@15057 -

rtl/beos/baseunix.pp

@@ -15,6 +15,7 @@
 Unit BaseUnix;
 
 Interface
+{$modeswitch out}
 {$inline on}
 Uses UnixType;
 

rtl/haiku/baseunix.pp

@@ -15,6 +15,7 @@
 Unit BaseUnix;
 
 Interface
+{$modeswitch out}
 {$inline on}
 Uses UnixType;
 
@@ -155,4 +156,4 @@ begin
   end;
 end;
 
-end.
+end.

rtl/objpas/classes/classesh.inc

@@ -504,6 +504,7 @@ type
     function GetNamePath: string; override;
     function Insert(Index: Integer): TCollectionItem;
     function FindItemID(ID: Integer): TCollectionItem;
+    procedure Exchange(Const Index1, index2: integer);
     procedure Sort(Const Compare : TCollectionSortCompare);
     property Count: Integer read GetCount;
     property ItemClass: TCollectionItemClass read FItemClass;

rtl/objpas/classes/collect.inc

@@ -389,6 +389,12 @@ begin
   end;
 end;
 
+procedure TCollection.Exchange(Const Index1, index2: integer);
+
+begin
+  FItems.Exchange(Index1,Index2);
+end;
+
 
 {****************************************************************************}
 {*                             TOwnedCollection                             *}