CF-1151.16.tar.gz

[apple/cf.git] / CFBasicHash.c

diff --git a/CFBasicHash.c b/CFBasicHash.c
index 3222c9679ade257034427aad1379221446624f5a..66b191b8ecc3f5193f4eece7cfb725f7ec9c4c24 100644 (file)
--- a/CFBasicHash.c
+++ b/CFBasicHash.c
@@ -2,14 +2,14 @@
  * Copyright (c) 2014 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * Copyright (c) 2014 Apple Inc. All rights reserved.
  *
  * @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. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ 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. 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,
  * 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,


@@ -17,12 +17,12 @@
  * 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.
  * 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@
  */
 
 /*     CFBasicHash.m
  * @APPLE_LICENSE_HEADER_END@
  */
 
 /*     CFBasicHash.m

-       Copyright (c) 2008-2013, Apple Inc. All rights reserved.
+       Copyright (c) 2008-2014, Apple Inc. All rights reserved.

        Responsibility: Christopher Kane
 */
 
        Responsibility: Christopher Kane
 */
 


@@ -391,22 +391,6 @@ CF_PRIVATE Boolean CFBasicHashHasStrongKeys(CFConstBasicHashRef ht) {
 #endif
 }
 
 #endif
 }
 

-CF_INLINE Boolean __CFBasicHashHasWeakValues(CFConstBasicHashRef ht) {
-#if DEPLOYMENT_TARGET_MACOSX
-    return ht->bits.weak_values ? true : false;
-#else
-    return false;
-#endif
-}
-
-CF_INLINE Boolean __CFBasicHashHasWeakKeys(CFConstBasicHashRef ht) {
-#if DEPLOYMENT_TARGET_MACOSX
-    return ht->bits.weak_keys ? true : false;
-#else
-    return false;
-#endif
-}
-

 CF_INLINE Boolean __CFBasicHashHasHashCache(CFConstBasicHashRef ht) {
 #if DEPLOYMENT_TARGET_MACOSX
     return ht->bits.hashes_offset ? true : false;
 CF_INLINE Boolean __CFBasicHashHasHashCache(CFConstBasicHashRef ht) {
 #if DEPLOYMENT_TARGET_MACOSX
     return ht->bits.hashes_offset ? true : false;


@@ -1591,7 +1575,8 @@ static const CFRuntimeClass __CFBasicHashClass = {
 };
 
 CF_PRIVATE CFTypeID CFBasicHashGetTypeID(void) {
 };
 
 CF_PRIVATE CFTypeID CFBasicHashGetTypeID(void) {

-    if (_kCFRuntimeNotATypeID == __kCFBasicHashTypeID) __kCFBasicHashTypeID = _CFRuntimeRegisterClass(&__CFBasicHashClass);
+    static dispatch_once_t initOnce;
+    dispatch_once(&initOnce, ^{ __kCFBasicHashTypeID = _CFRuntimeRegisterClass(&__CFBasicHashClass); });

     return __kCFBasicHashTypeID;
 }
 
     return __kCFBasicHashTypeID;
 }