Changeset 51908 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.h

Timestamp:

Dec 9, 2009, 11:00:04 AM (15 years ago)

Author:

[email protected]

Message:

Attempt to fix the Windows build.

Reviewed by Sam Weinig.

• wtf/FastMalloc.h:

File:

• trunk/JavaScriptCore/wtf/FastMalloc.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -217 +217 @@
 #if !PLATFORM(QT)
 
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4290) // Disable the C++ exception specification ignored warning.
+#endif
 WTF_PRIVATE_INLINE void* operator new(size_t size) throw (std::bad_alloc) { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void* operator new(size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
@@ -225 +229 @@
 WTF_PRIVATE_INLINE void operator delete[](void* p) throw() { fastFree(p); }
 WTF_PRIVATE_INLINE void operator delete[](void* p, const std::nothrow_t&) throw() { fastFree(p); }
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
 
 #endif