--- xnu/xnu-3248.50.21/libkern/c++/OSBoolean.cpp
+++ xnu/xnu-792.13.8/libkern/c++/OSBoolean.cpp
@@ -1,29 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * 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.
- * 
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * 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.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
  * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /* OSBoolean.cpp created by rsulack on Tue Oct 12 1999 */
 
@@ -34,7 +36,7 @@
 
 #define super OSObject
 
-OSDefineMetaClassAndStructorsWithInit(OSBoolean, OSObject, OSBoolean::initialize())
+OSDefineMetaClassAndStructors(OSBoolean, OSObject)
 OSMetaClassDefineReservedUnused(OSBoolean, 0);
 OSMetaClassDefineReservedUnused(OSBoolean, 1);
 OSMetaClassDefineReservedUnused(OSBoolean, 2);
@@ -82,8 +84,8 @@
     assert(false);
 }
 
-void OSBoolean::taggedRetain(__unused const void *tag) const { }
-void OSBoolean::taggedRelease(__unused const void *tag, __unused const int when) const { }
+void OSBoolean::taggedRetain(const void *tag) const { }
+void OSBoolean::taggedRelease(const void *tag, const int when) const { }
 
 OSBoolean *OSBoolean::withBoolean(bool inValue)
 {
@@ -110,7 +112,5 @@
 
 bool OSBoolean::serialize(OSSerialize *s) const
 {
-    if (s->binary) return s->binarySerialize(this);
-
     return s->addString(value ? "<true/>" : "<false/>");
 }