--- xnu/xnu-1228/libkern/c++/OSObject.cpp
+++ xnu/xnu-1699.22.73/libkern/c++/OSObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -87,25 +87,6 @@
 OSMetaClassDefineReservedUnused(OSObject, 14);
 OSMetaClassDefineReservedUnused(OSObject, 15);
 
-#ifdef __ppc__
-OSMetaClassDefineReservedUnused(OSObject, 16);
-OSMetaClassDefineReservedUnused(OSObject, 17);
-OSMetaClassDefineReservedUnused(OSObject, 18);
-OSMetaClassDefineReservedUnused(OSObject, 19);
-OSMetaClassDefineReservedUnused(OSObject, 20);
-OSMetaClassDefineReservedUnused(OSObject, 21);
-OSMetaClassDefineReservedUnused(OSObject, 22);
-OSMetaClassDefineReservedUnused(OSObject, 23);
-OSMetaClassDefineReservedUnused(OSObject, 24);
-OSMetaClassDefineReservedUnused(OSObject, 25);
-OSMetaClassDefineReservedUnused(OSObject, 26);
-OSMetaClassDefineReservedUnused(OSObject, 27);
-OSMetaClassDefineReservedUnused(OSObject, 28);
-OSMetaClassDefineReservedUnused(OSObject, 29);
-OSMetaClassDefineReservedUnused(OSObject, 30);
-OSMetaClassDefineReservedUnused(OSObject, 31);
-#endif
-
 static const char *getClassName(const OSObject *obj)
 {
     const OSMetaClass *meta = obj->getMetaClass();
@@ -115,12 +96,6 @@
 bool OSObject::init()
     { return true; }
 
-#if (!__ppc__) || (__GNUC__ < 3)
-
-// Implemented in assembler in post gcc 3.x systems as we have a problem
-// where the destructor in gcc2.95 gets 2 arguments.  The second argument
-// appears to be a flag argument.  I have copied the assembler from Puma xnu
-// to OSRuntimeSupport.c  So for 2.95 builds use the C 
 void OSObject::free()
 {
     const OSMetaClass *meta = getMetaClass();
@@ -129,7 +104,6 @@
 	meta->instanceDestructed();
     delete this;
 }
-#endif /* (!__ppc__) || (__GNUC__ < 3) */
 
 int OSObject::getRetainCount() const
 {
@@ -165,7 +139,7 @@
 
 #if !DEBUG
 		break;	// Break out of update loop which pegs the reference
-#else DEBUG
+#else /* DEBUG */
                 // @@@ gvdl: eventually need to make this panic optional
                 // based on a boot argument i.e. debug= boot flag
                 msg = "About to wrap the reference count, reference leak?";
@@ -175,7 +149,7 @@
         }
 
 	newCount = origCount + inc;
-    } while (!OSCompareAndSwap(origCount, newCount, (UInt32 *) countP));
+    } while (!OSCompareAndSwap(origCount, newCount, const_cast<UInt32 *>(countP)));
 }
 
 void OSObject::taggedRelease(const void *tag) const
@@ -212,7 +186,7 @@
 
 #if !DEBUG
 		return;	// return out of function which pegs the reference
-#else DEBUG
+#else /* DEBUG */
                 // @@@ gvdl: eventually need to make this panic optional
                 // based on a boot argument i.e. debug= boot flag
                 panic("OSObject::refcount: %s",
@@ -226,23 +200,28 @@
         else
             newCount = actualCount;
 
-    } while (!OSCompareAndSwap(origCount, newCount, (UInt32 *) countP));
+    } while (!OSCompareAndSwap(origCount, newCount, const_cast<UInt32 *>(countP)));
 
     //
     // This panic means that we have just attempted to release an object
-    // who's retain count has gone to less than the number of collections
+    // whose retain count has gone to less than the number of collections
     // it is a member off.  Take a panic immediately.
-    // In Fact the panic MAY not be a registry corruption but it is 
+    // In fact the panic MAY not be a registry corruption but it is 
     // ALWAYS the wrong thing to do.  I call it a registry corruption 'cause
     // the registry is the biggest single use of a network of collections.
     //
-    if ((UInt16) actualCount < (actualCount >> 16))
-	panic("A driver releasing a(n) %s has corrupted the registry\n",
-	    getClassName(this));
+// xxx - this error message is overly-specific;
+// xxx - any code in the kernel could trip this,
+// xxx - and it applies as noted to all collections, not just the registry
+    if ((UInt16) actualCount < (actualCount >> 16)) {
+        panic("A kext releasing a(n) %s has corrupted the registry.",
+            getClassName(this));
+    }
 
     // Check for a 'free' condition and that if we are first through
-    if (newCount == 0xffff)
-	((OSObject *) this)->free();
+    if (newCount == 0xffff) {
+        (const_cast<OSObject *>(this))->free();
+    }
 }
 
 void OSObject::release() const