--- xnu/xnu-344.21.74/libkern/c++/OSArray.cpp
+++ xnu/xnu-124.7/libkern/c++/OSArray.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -75,7 +72,7 @@
 
 bool OSArray::initWithObjects(const OSObject *objects[],
                               unsigned int theCount,
-                              unsigned int theCapacity)
+                              unsigned int theCapacity = 0)
 {
     unsigned int capacity;
 
@@ -96,14 +93,14 @@
             return false;
 
         array[count++] = newObject;
-        newObject->taggedRetain(OSTypeID(OSCollection));
+        newObject->retain();
     }
 
     return true;	
 }
 
 bool OSArray::initWithArray(const OSArray *anArray,
-                            unsigned int theCapacity)
+                            unsigned int theCapacity = 0)
 {
     if ( !anArray )
         return false;
@@ -117,7 +114,7 @@
     OSArray *me = new OSArray;
 
     if (me && !me->initWithCapacity(capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -126,12 +123,12 @@
 
 OSArray *OSArray::withObjects(const OSObject *objects[],
                               unsigned int count,
-                              unsigned int capacity)
+                              unsigned int capacity = 0)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithObjects(objects, count, capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -139,12 +136,12 @@
 }
 
 OSArray *OSArray::withArray(const OSArray *array,
-                            unsigned int capacity)
+                            unsigned int capacity = 0)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithArray(array, capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -209,7 +206,7 @@
 
     haveUpdated();
     for (i = 0; i < count; i++)
-        array[i]->taggedRelease(OSTypeID(OSCollection));
+        array[i]->release();
     count = 0;
 }
 
@@ -236,7 +233,7 @@
             array[i] = array[i-1];
     }
     array[index] = anObject;
-    anObject->taggedRetain(OSTypeID(OSCollection));
+    anObject->retain();
     count++;
 
     return true;
@@ -259,7 +256,7 @@
         const OSMetaClassBase *newObject = otherArray->getObject(i);
 
         array[count++] = newObject;
-        newObject->taggedRetain(OSTypeID(OSCollection));
+        newObject->retain();
     }
 
     return true;
@@ -276,9 +273,9 @@
     haveUpdated();
     oldObject = array[index];
     array[index] = anObject;
-    anObject->taggedRetain(OSTypeID(OSCollection));
-
-    oldObject->taggedRelease(OSTypeID(OSCollection));
+    anObject->retain();
+
+    oldObject->release();
 }
 
 void OSArray::removeObject(unsigned int index)
@@ -296,7 +293,7 @@
     for (i = index; i < count; i++)
         array[i] = array[i+1];
 
-    oldObject->taggedRelease(OSTypeID(OSCollection));
+    oldObject->release();
 }
 
 bool OSArray::isEqualTo(const OSArray *anArray) const