--- xnu/xnu-792.25.20/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-1228/libkern/c++/OSMetaClass.cpp
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 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@
  */
 /* OSMetaClass.cpp created by gvdl on Fri 1998-11-17 */
 
@@ -328,13 +334,13 @@
     }
 }
 
-void *OSMetaClass::operator new(size_t size) { return 0; }
+void *OSMetaClass::operator new(__unused size_t size) { return 0; }
 void OSMetaClass::retain() const { }
 void OSMetaClass::release() const { }
-void OSMetaClass::release(int when) const { }
-void OSMetaClass::taggedRetain(const void *tag) const { }
-void OSMetaClass::taggedRelease(const void *tag) const { }
-void OSMetaClass::taggedRelease(const void *tag, const int when) const { }
+void OSMetaClass::release(__unused int when) const { }
+void OSMetaClass::taggedRetain(__unused const void *tag) const { }
+void OSMetaClass::taggedRelease(__unused const void *tag) const { }
+void OSMetaClass::taggedRelease(__unused const void *tag, __unused const int when) const { }
 int  OSMetaClass::getRetainCount() const { return 0; }
 
 const char *OSMetaClass::getClassName() const
@@ -593,8 +599,8 @@
 
 extern "C" kern_return_t kmod_unload_cache(void);
 
-static void _OSMetaClassConsiderUnloads(thread_call_param_t p0,
-                                        thread_call_param_t p1)
+static void _OSMetaClassConsiderUnloads(__unused thread_call_param_t p0,
+                                        __unused thread_call_param_t p1)
 {
     OSSet *kmodClasses;
     OSSymbol *kmodName;
@@ -855,7 +861,7 @@
     return 0;
 }
 
-bool OSMetaClass::serialize(OSSerialize *s) const
+bool OSMetaClass::serialize(__unused OSSerialize *s) const
 {
     panic("OSMetaClass::serialize(): Obsoleted\n");
     return false;