From 55d5e76fdb56a7c66c76374c6daaff86f06db5c5 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Sun, 28 Jul 2013 18:20:00 +0000 Subject: [PATCH] Glen: Minor tweaks to locale.cpp to help it compile with exceptions turned off. llvm-svn: 187332 --- libcxx/src/locale.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index bf95732ed7de..6300ce1c54b9 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"