--- xnu/xnu-201/libkern/c++/OSArray.cpp
+++ xnu/xnu-517/libkern/c++/OSArray.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -72,7 +75,7 @@
 
 bool OSArray::initWithObjects(const OSObject *objects[],
                               unsigned int theCount,
-                              unsigned int theCapacity = 0)
+                              unsigned int theCapacity)
 {
     unsigned int capacity;
 
@@ -93,14 +96,14 @@
             return false;
 
         array[count++] = newObject;
-        newObject->retain();
+        newObject->taggedRetain(OSTypeID(OSCollection));
     }
 
     return true;	
 }
 
 bool OSArray::initWithArray(const OSArray *anArray,
-                            unsigned int theCapacity = 0)
+                            unsigned int theCapacity)
 {
     if ( !anArray )
         return false;
@@ -114,7 +117,7 @@
     OSArray *me = new OSArray;
 
     if (me && !me->initWithCapacity(capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -123,12 +126,12 @@
 
 OSArray *OSArray::withObjects(const OSObject *objects[],
                               unsigned int count,
-                              unsigned int capacity = 0)
+                              unsigned int capacity)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithObjects(objects, count, capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -136,12 +139,12 @@
 }
 
 OSArray *OSArray::withArray(const OSArray *array,
-                            unsigned int capacity = 0)
+                            unsigned int capacity)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithArray(array, capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -206,7 +209,7 @@
 
     haveUpdated();
     for (i = 0; i < count; i++)
-        array[i]->release();
+        array[i]->taggedRelease(OSTypeID(OSCollection));
     count = 0;
 }
 
@@ -233,7 +236,7 @@
             array[i] = array[i-1];
     }
     array[index] = anObject;
-    anObject->retain();
+    anObject->taggedRetain(OSTypeID(OSCollection));
     count++;
 
     return true;
@@ -256,7 +259,7 @@
         const OSMetaClassBase *newObject = otherArray->getObject(i);
 
         array[count++] = newObject;
-        newObject->retain();
+        newObject->taggedRetain(OSTypeID(OSCollection));
     }
 
     return true;
@@ -273,9 +276,9 @@
     haveUpdated();
     oldObject = array[index];
     array[index] = anObject;
-    anObject->retain();
-
-    oldObject->release();
+    anObject->taggedRetain(OSTypeID(OSCollection));
+
+    oldObject->taggedRelease(OSTypeID(OSCollection));
 }
 
 void OSArray::removeObject(unsigned int index)
@@ -293,7 +296,7 @@
     for (i = index; i < count; i++)
         array[i] = array[i+1];
 
-    oldObject->release();
+    oldObject->taggedRelease(OSTypeID(OSCollection));
 }
 
 bool OSArray::isEqualTo(const OSArray *anArray) const