Loading...
libkern/c++/OSCollection.cpp xnu-1699.22.73 xnu-792.6.56
--- xnu/xnu-1699.22.73/libkern/c++/OSCollection.cpp
+++ xnu/xnu-792.6.56/libkern/c++/OSCollection.cpp
@@ -1,19 +1,14 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_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.
+ * compliance with the License. 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
@@ -23,7 +18,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* IOArray.h created by rsulack on Thu 11-Sep-1997 */
 
@@ -60,21 +55,9 @@
 
 void OSCollection::haveUpdated()
 {
-    if (fOptions & kImmutable)
-    {
-#if __LP64__
-	if (!(gIOKitDebug & kOSRegistryModsMode))
-#else
-	if (gIOKitDebug & kOSRegistryModsMode)
-#endif
-	{
-	    panic("Trying to change a collection in the registry");
-	}
-	else
-	{
-	    OSReportWithBacktrace("Trying to change a collection in the registry");
-	}
-    }
+    if ( (gIOKitDebug & kOSLogRegistryMods) && (fOptions & kImmutable) )
+	OSReportWithBacktrace("Trying to change a collection in the registry");
+
     updateStamp++;
 }