From 908d2bebaf8a9a3c52082e81a8d65ab82ee933c2 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Sat, 25 Feb 2012 21:36:01 +0000
Subject: At least temporarily move operator new/delete from the abi back to
 here.  I'm having trouble reexporting it as a weak symbol.

llvm-svn: 151459
---
 libcxx/src/new.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcxx/src')

diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index dfeb5a1ac5f..11d7be62aff 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -24,7 +24,7 @@
     static std::new_handler __new_handler;
 #endif
 
-#ifndef _LIBCPPABI_VERSION
+//#ifndef _LIBCPPABI_VERSION
 
 // Implement all new and delete operators as weak definitions
 // in this shared library, so that they can be overriden by programs
@@ -134,7 +134,7 @@ operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
     ::operator delete[](ptr);
 }
 
-#endif
+//#endif  // _LIBCPPABI_VERSION
 
 namespace std
 {
-- 
cgit v1.2.3