summaryrefslogtreecommitdiffstats
path: root/libcxx/src/memory.cpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2014-12-12 02:36:23 +0000
committerEric Fiselier <eric@efcs.ca>2014-12-12 02:36:23 +0000
commit7a68749f7f9ec455fe1860b6d8f8029a0a7ed8cd (patch)
tree1d3f0718468dacdf8b2c3fff0e5b7bcadde963e0 /libcxx/src/memory.cpp
parent1e3a4ebc6e1af1bbacc795d21b15efbe63bfdee2 (diff)
downloadbcm5719-llvm-7a68749f7f9ec455fe1860b6d8f8029a0a7ed8cd.tar.gz
bcm5719-llvm-7a68749f7f9ec455fe1860b6d8f8029a0a7ed8cd.zip
Fix building and running tests when LIBCXX_ENABLE_EXCEPTIONS or LIBCXX_ENABLE_RTTI are turned off.
llvm-svn: 224095
Diffstat (limited to 'libcxx/src/memory.cpp')
-rw-r--r--libcxx/src/memory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp
index c56d031adfb..8a4eb34811f 100644
--- a/libcxx/src/memory.cpp
+++ b/libcxx/src/memory.cpp
@@ -111,7 +111,7 @@ __shared_weak_count::lock() _NOEXCEPT
return 0;
}
-#ifndef _LIBCPP_NO_RTTI
+#if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC)
const void*
__shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT
OpenPOWER on IntegriCloud