summaryrefslogtreecommitdiff
path: root/src/utils.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-08-02 13:11:19 -0500
committerJohn Wiegley <johnw@newartisans.com>2012-08-02 13:11:24 -0500
commit2de6af2761672c1b0697e285de20b291a3fc3a55 (patch)
tree608476cb76a85e3f68af6494642863d7d782fcaf /src/utils.cc
parentf34a4e315eee54f31993432a349804ed51ea9138 (diff)
downloadfork-ledger-2de6af2761672c1b0697e285de20b291a3fc3a55.tar.gz
fork-ledger-2de6af2761672c1b0697e285de20b291a3fc3a55.tar.bz2
fork-ledger-2de6af2761672c1b0697e285de20b291a3fc3a55.zip
Don't use __has_feature in utils.cc
Diffstat (limited to 'src/utils.cc')
-rw-r--r--src/utils.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils.cc b/src/utils.cc
index bdce009f..e5faf184 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -153,7 +153,7 @@ std::size_t current_memory_size()
return memory_size;
}
-#if !defined(__has_feature) || !__has_feature(address_sanitizer)
+//#if !defined(__has_feature) || !__has_feature(address_sanitizer)
static void trace_new_func(void * ptr, const char * which, std::size_t size)
{
@@ -223,11 +223,11 @@ static void trace_delete_func(void * ptr, const char * which)
memory_tracing_active = true;
}
-#endif // !defined(__has_feature) || !__has_feature(address_sanitizer)
+//#endif // !defined(__has_feature) || !__has_feature(address_sanitizer)
} // namespace ledger
-#if !defined(__has_feature) || !__has_feature(address_sanitizer)
+//#if !defined(__has_feature) || !__has_feature(address_sanitizer)
void * operator new(std::size_t size) throw (std::bad_alloc) {
void * ptr = std::malloc(size);
@@ -274,7 +274,7 @@ void operator delete[](void * ptr, const std::nothrow_t&) throw() {
std::free(ptr);
}
-#endif // !defined(__has_feature) || !__has_feature(address_sanitizer)
+//#endif // !defined(__has_feature) || !__has_feature(address_sanitizer)
namespace ledger {