--- xnu/xnu-792/libkern/c++/OSCollection.cpp
+++ xnu/xnu-344.21.74/libkern/c++/OSCollection.cpp
@@ -3,38 +3,35 @@
  *
  * @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@
  */
 /* IOArray.h created by rsulack on Thu 11-Sep-1997 */
 
-#include <libkern/OSDebug.h>
-
 #include <libkern/c++/OSCollection.h>
-#include <libkern/c++/OSDictionary.h>
-
-#include <IOKit/IOKitDebug.h>
+#include <libkern/c++/OSArray.h>
 
 #define super OSObject
 
 OSDefineMetaClassAndAbstractStructors(OSCollection, OSObject)
-
-
-OSMetaClassDefineReservedUsed(OSCollection, 0);
-OSMetaClassDefineReservedUsed(OSCollection, 1);
+OSMetaClassDefineReservedUnused(OSCollection, 0);
+OSMetaClassDefineReservedUnused(OSCollection, 1);
 OSMetaClassDefineReservedUnused(OSCollection, 2);
 OSMetaClassDefineReservedUnused(OSCollection, 3);
 OSMetaClassDefineReservedUnused(OSCollection, 4);
@@ -51,40 +48,3 @@
 
     return true;
 }
-
-void OSCollection::haveUpdated()
-{
-    if ( (gIOKitDebug & kOSLogRegistryMods) && (fOptions & kImmutable) )
-	OSReportWithBacktrace("Trying to change a collection in the registry");
-
-    updateStamp++;
-}
-
-unsigned OSCollection::setOptions(unsigned options, unsigned mask, void *)
-{
-    unsigned old = fOptions;
-
-    if (mask)
-	fOptions = (old & ~mask) | (options & mask);
-
-    return old;
-}
-
-OSCollection *  OSCollection::copyCollection(OSDictionary *cycleDict)
-{
-    if (cycleDict) {
-	OSObject *obj = cycleDict->getObject((const OSSymbol *) this);
-	if (obj)
-	    obj->retain();
-
-	return reinterpret_cast<OSCollection *>(obj);
-    }
-    else {
-	// If we are here it means that there is a collection subclass that
-	// hasn't overridden the copyCollection method.  In which case just
-	// return a reference to ourselves.  
-	// Hopefully this collection will not be inserted into the registry
-	retain();
-	return this;
-    }
-}