--- xnu/xnu-792.6.56/libkern/c++/OSSet.cpp
+++ xnu/xnu-344.49/libkern/c++/OSSet.cpp
@@ -2,6 +2,8 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -22,10 +24,9 @@
  */
 /* IOSet.m created by rsulack on Thu 11-Jun-1998 */
 
-#include <libkern/c++/OSDictionary.h>
+#include <libkern/c++/OSSet.h>
 #include <libkern/c++/OSArray.h>
 #include <libkern/c++/OSSerialize.h>
-#include <libkern/c++/OSSet.h>
 
 #define super OSCollection
 
@@ -39,9 +40,6 @@
 OSMetaClassDefineReservedUnused(OSSet, 6);
 OSMetaClassDefineReservedUnused(OSSet, 7);
 
-#define EXT_CAST(obj) \
-    reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
 bool OSSet::initWithCapacity(unsigned int inCapacity)
 {
     if ( !super::init() )
@@ -56,7 +54,7 @@
 
 bool OSSet::initWithObjects(const OSObject *inObjects[],
                               unsigned int inCount,
-                              unsigned int inCapacity)
+                              unsigned int inCapacity = 0)
 {
     unsigned int capacity = inCount;
 
@@ -81,7 +79,7 @@
 }
 
 bool OSSet::initWithArray(const OSArray *inArray,
-                          unsigned int inCapacity)
+                          unsigned int inCapacity = 0)
 {
     if ( !inArray )
         return false;
@@ -91,7 +89,7 @@
 }
 
 bool OSSet::initWithSet(const OSSet *inSet,
-                        unsigned int inCapacity)
+                        unsigned int inCapacity = 0)
 {
     return initWithArray(inSet->members, inCapacity);
 }
@@ -101,7 +99,7 @@
     OSSet *me = new OSSet;
 
     if (me && !me->initWithCapacity(capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -110,12 +108,12 @@
 
 OSSet *OSSet::withObjects(const OSObject *objects[],
                           unsigned int count,
-                          unsigned int capacity)
+                          unsigned int capacity = 0)
 {
     OSSet *me = new OSSet;
 
     if (me && !me->initWithObjects(objects, count, capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -123,12 +121,12 @@
 }
 
 OSSet *OSSet::withArray(const OSArray *array,
-                        unsigned int capacity)
+                        unsigned int capacity = 0)
 {
     OSSet *me = new OSSet;
 
     if (me && !me->initWithArray(array, capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -136,12 +134,12 @@
 }
 
 OSSet *OSSet::withSet(const OSSet *set,
-                      unsigned int capacity)
+                      unsigned int capacity = 0)
 {
     OSSet *me = new OSSet;
 
     if (me && !me->initWithSet(set, capacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -150,7 +148,6 @@
 
 void OSSet::free()
 {
-    (void) members->super::setOptions(0, kImmutable);
     if (members)
         members->release();
 
@@ -212,7 +209,7 @@
 
 bool OSSet::merge(const OSSet *set)
 {
-    return merge(set->members);
+    return setObject(set->members);
 }
 
 void OSSet::removeObject(const OSMetaClassBase *anObject)
@@ -327,71 +324,3 @@
 
     return s->addXMLEndTag("set");
 }
-
-unsigned OSSet::setOptions(unsigned options, unsigned mask, void *)
-{
-    unsigned old = super::setOptions(options, mask);
-    if ((old ^ options) & mask)
-	members->setOptions(options, mask);
-
-    return old;
-}
-
-OSCollection * OSSet::copyCollection(OSDictionary *cycleDict)
-{
-    bool allocDict = !cycleDict;
-    OSCollection *ret = 0;
-    OSSet *newSet = 0;
-
-    if (allocDict) {
-	cycleDict = OSDictionary::withCapacity(16);
-	if (!cycleDict)
-	    return 0;
-    }
-
-    do {
-	// Check for a cycle
-	ret = super::copyCollection(cycleDict);
-	if (ret)
-	    continue;	// Found it
-
-	newSet = OSSet::withCapacity(members->capacity);
-	if (!newSet)
-	    continue;	// Couldn't create new set abort
-
-	// Insert object into cycle Dictionary
-	cycleDict->setObject((const OSSymbol *) this, newSet);
-
-	OSArray *newMembers = newSet->members;
-	newMembers->capacityIncrement = members->capacityIncrement;
-
-	// Now copy over the contents into the new duplicate
-	for (unsigned int i = 0; i < members->count; i++) {
-	    OSObject *obj = EXT_CAST(members->array[i]);
-	    OSCollection *coll = OSDynamicCast(OSCollection, obj);
-	    if (coll) {
-		OSCollection *newColl = coll->copyCollection(cycleDict);
-		if (newColl) {
-		    obj = newColl;	// Rely on cycleDict ref for a bit
-		    newColl->release();
-		}
-		else
-		    goto abortCopy;
-	    };
-	    newMembers->setObject(obj);
-	};
-
-	ret = newSet;
-	newSet = 0;
-
-    } while(false);
-
-abortCopy:
-    if (newSet)
-	newSet->release();
-
-    if (allocDict)
-	cycleDict->release();
-
-    return ret;
-}