summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-07-28 18:20:00 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-07-28 18:20:00 +0000
commit55d5e76fdb56a7c66c76374c6daaff86f06db5c5 (patch)
tree04659dd6276d5b9937d059afcc807b15a4c08e05 /libcxx/src
parentd1594bdaa93211e38b6426ba2fdd714c9b7d41f1 (diff)
downloadbcm5719-llvm-55d5e76fdb56a7c66c76374c6daaff86f06db5c5.tar.gz
bcm5719-llvm-55d5e76fdb56a7c66c76374c6daaff86f06db5c5.zip
Glen: Minor tweaks to locale.cpp to help it compile with exceptions turned off.
llvm-svn: 187332
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/locale.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index bf95732ed7d..6300ce1c54b 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -18,9 +18,10 @@
#include "codecvt"
#include "vector"
#include "algorithm"
-#include "algorithm"
#include "typeinfo"
-#include "type_traits"
+#ifndef _LIBCPP_NO_EXCEPTIONS
+# include "type_traits"
+#endif
#include "clocale"
#include "cstring"
#include "cwctype"
OpenPOWER on IntegriCloud