| OLD | NEW |
| 1 /* | 1 /* |
| 2 | 2 |
| 3 Copyright (C) 2010 Apple Inc. All rights reserved. | 3 Copyright (C) 2010 Apple Inc. All rights reserved. |
| 4 | 4 |
| 5 Redistribution and use in source and binary forms, with or without | 5 Redistribution and use in source and binary forms, with or without |
| 6 modification, are permitted provided that the following conditions | 6 modification, are permitted provided that the following conditions |
| 7 are met: | 7 are met: |
| 8 1. Redistributions of source code must retain the above copyright | 8 1. Redistributions of source code must retain the above copyright |
| 9 notice, this list of conditions and the following disclaimer. | 9 notice, this list of conditions and the following disclaimer. |
| 10 2. Redistributions in binary form must reproduce the above copyright | 10 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 template<typename C, typename T> operator T C::*() { return 0; } | 59 template<typename C, typename T> operator T C::*() { return 0; } |
| 60 private: | 60 private: |
| 61 // Do not allow taking the address of nullptr. | 61 // Do not allow taking the address of nullptr. |
| 62 void operator&(); | 62 void operator&(); |
| 63 }; | 63 }; |
| 64 } | 64 } |
| 65 WTF_EXPORT extern const std::nullptr_t nullptr; | 65 WTF_EXPORT extern const std::nullptr_t nullptr; |
| 66 | 66 |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 #if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS) | |
| 70 #define WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(ClassName) \ | 69 #define WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(ClassName) \ |
| 71 private: \ | 70 private: \ |
| 72 ClassName(int) = delete | 71 ClassName(int) = delete |
| 73 #define WTF_DISALLOW_ZERO_ASSIGNMENT(ClassName) \ | 72 #define WTF_DISALLOW_ZERO_ASSIGNMENT(ClassName) \ |
| 74 private: \ | 73 private: \ |
| 75 ClassName& operator=(int) = delete | 74 ClassName& operator=(int) = delete |
| 76 #else | |
| 77 #define WTF_DISALLOW_CONSTRUCTION_FROM_ZERO(ClassName) \ | |
| 78 private: \ | |
| 79 ClassName(int) | |
| 80 #define WTF_DISALLOW_ZERO_ASSIGNMENT(ClassName) \ | |
| 81 private: \ | |
| 82 ClassName& operator=(int) | |
| 83 #endif | |
| 84 | 75 |
| 85 #endif | 76 #endif |
| OLD | NEW |