--- xnu/xnu-792.2.4/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-1699.26.8/libkern/c++/OSDictionary.cpp
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* OSDictionary.m created by rsulack on Fri 12-Sep-1997 */
 /* OSDictionary.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -81,7 +87,7 @@
                                    unsigned int theCount,
                                    unsigned int theCapacity)
 {
-    unsigned int capacity = theCount;
+    unsigned int newCapacity = theCount;
 
     if (!objects || !keys)
         return false;
@@ -90,10 +96,10 @@
         if (theCount > theCapacity)
             return false;
         
-        capacity = theCapacity;
-    }
-
-    if (!initWithCapacity(capacity))
+        newCapacity = theCapacity;
+    }
+
+    if (!initWithCapacity(newCapacity))
         return false;
 
     for (unsigned int i = 0; i < theCount; i++) {
@@ -111,7 +117,7 @@
                                    unsigned int theCount,
                                    unsigned int theCapacity)
 {
-    unsigned int capacity = theCount;
+    unsigned int newCapacity = theCount;
 
     if (!objects || !keys)
         return false;
@@ -120,10 +126,10 @@
         if (theCount > theCapacity)
             return false;
 
-        capacity = theCapacity;
-    }
-
-    if (!initWithCapacity(capacity))
+        newCapacity = theCapacity;
+    }
+
+    if (!initWithCapacity(newCapacity))
         return false;
 
     for (unsigned int i = 0; i < theCount; i++) {
@@ -147,21 +153,21 @@
 bool OSDictionary::initWithDictionary(const OSDictionary *dict,
                                       unsigned int theCapacity)
 {
-    unsigned int capacity;
+    unsigned int newCapacity;
 
     if ( !dict )
         return false;
 
-    capacity = dict->count;
+    newCapacity = dict->count;
 
     if ( theCapacity ) {
         if ( dict->count > theCapacity )
             return false;
         
-        capacity = theCapacity;
-    }
-
-    if (!initWithCapacity(capacity))
+        newCapacity = theCapacity;
+    }
+
+    if (!initWithCapacity(newCapacity))
         return false;
 
     count = dict->count;
@@ -234,7 +240,7 @@
     (void) super::setOptions(0, kImmutable);
     flushCollection();
     if (dictionary) {
-        kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
+        kfree(dictionary, capacity * sizeof(dictEntry));
         ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
     }
 
@@ -277,7 +283,7 @@
         bzero(&newDict[capacity], newSize - oldSize);
 
         ACCUMSIZE(newSize - oldSize);
-        kfree((vm_offset_t)dictionary, oldSize);
+        kfree(dictionary, oldSize);
 
         dictionary = newDict;
         capacity = newCapacity;
@@ -365,7 +371,7 @@
     if ( !OSDynamicCast(OSDictionary, srcDict) )
         return false;
 
-    iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
+    iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
     if ( !iter )
         return false;
 
@@ -391,7 +397,7 @@
     // if the key exists, remove the object
     for (unsigned int i = 0; i < count; i++)
         if (aKey == dictionary[i].key)
-            return (OSObject *) dictionary[i].value;
+            return (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
 
     return 0;
 }