--- xnu/xnu-792.2.4/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-517.9.4/libkern/c++/OSDictionary.cpp
@@ -52,9 +52,6 @@
 #define ACCUMSIZE(s)
 #endif
 
-#define EXT_CAST(obj) \
-    reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
 bool OSDictionary::initWithCapacity(unsigned int inCapacity)
 {
     if (!super::init())
@@ -231,7 +228,6 @@
 
 void OSDictionary::free()
 {
-    (void) super::setOptions(0, kImmutable);
     flushCollection();
     if (dictionary) {
         kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
@@ -308,10 +304,10 @@
         if (aKey == dictionary[i].key) {
             const OSMetaClassBase *oldObject = dictionary[i].value;
 
-            haveUpdated();
-
             anObject->taggedRetain(OSTypeID(OSCollection));
             dictionary[i].value = anObject;
+
+            haveUpdated();
 
             oldObject->taggedRelease(OSTypeID(OSCollection));
             return true;
@@ -321,14 +317,14 @@
     // add new key, possibly extending our capacity
     if (count >= capacity && count >= ensureCapacity(count+1))
         return 0;
-
-    haveUpdated();
 
     aKey->taggedRetain(OSTypeID(OSCollection));
     anObject->taggedRetain(OSTypeID(OSCollection));
     dictionary[count].key = aKey;
     dictionary[count].value = anObject;
     count++;
+
+    haveUpdated();
 
     return true;
 }
@@ -572,77 +568,3 @@
 
     return s->addXMLEndTag("dict");
 }
-
-unsigned OSDictionary::setOptions(unsigned options, unsigned mask, void *)
-{
-    unsigned old = super::setOptions(options, mask);
-    if ((old ^ options) & mask) {
-
-	// Value changed need to recurse over all of the child collections
-	for ( unsigned i = 0; i < count; i++ ) {
-	    OSCollection *v = OSDynamicCast(OSCollection, dictionary[i].value);
-	    if (v)
-		v->setOptions(options, mask);
-	}
-    }
-
-    return old;
-}
-
-OSCollection * OSDictionary::copyCollection(OSDictionary *cycleDict)
-{
-    bool allocDict = !cycleDict;
-    OSCollection *ret = 0;
-    OSDictionary *newDict = 0;
-
-    if (allocDict) {
-	cycleDict = OSDictionary::withCapacity(16);
-	if (!cycleDict)
-	    return 0;
-    }
-
-    do {
-	// Check for a cycle
-	ret = super::copyCollection(cycleDict);
-	if (ret)
-	    continue;
-	
-	newDict = OSDictionary::withDictionary(this);
-	if (!newDict)
-	    continue;
-
-	// Insert object into cycle Dictionary
-	cycleDict->setObject((const OSSymbol *) this, newDict);
-
-	for (unsigned int i = 0; i < count; i++) {
-	    const OSMetaClassBase *obj = dictionary[i].value;
-	    OSCollection *coll = OSDynamicCast(OSCollection, EXT_CAST(obj));
-
-	    if (coll) {
-		OSCollection *newColl = coll->copyCollection(cycleDict);
-		if (!newColl)
-		    goto abortCopy;
-
-		newDict->dictionary[i].value = newColl;
-
-		coll->taggedRelease(OSTypeID(OSCollection));
-		newColl->taggedRetain(OSTypeID(OSCollection));
-		newColl->release();
-	    };
-	}
-
-	ret = newDict;
-	newDict = 0;
-
-    } while (false);
-
-abortCopy:
-    if (newDict)
-	newDict->release();
-
-    if (allocDict)
-	cycleDict->release();
-
-    return ret;
-}
-