diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-05-24 17:49:41 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-05-24 17:49:41 +0000 |
| commit | 128ba7191da78d948b72b9c7adddc37002b391ef (patch) | |
| tree | 777573e0e91f4127e3b389583832de434bff15fc /libcxx/include/algorithm | |
| parent | 8a57aeca2abfbdd7659af285c10af9e82ba7783d (diff) | |
| download | bcm5719-llvm-128ba7191da78d948b72b9c7adddc37002b391ef.tar.gz bcm5719-llvm-128ba7191da78d948b72b9c7adddc37002b391ef.zip | |
patch by Jeffrey Yasskin for porting to Ubuntu Hardy. Everything was accepted except there were some bug fixes needed in <locale> for the __nolocale_* series. For the apple branch I ended up using templates instead of the var_args solution because it seemed both safer and more efficient.
llvm-svn: 104516
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index f3412f72600..c53bf3766e6 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -552,16 +552,12 @@ template <class BidirectionalIterator, class Compare> #ifdef _LIBCPP_DEBUG #include <cassert> #endif -//#include <cstdlib> -#define RAND_MAX 0x7fffffff // #include <cstdlib> -extern "C" int rand(void); // #include <cstdlib> +#include <cstdlib> #pragma GCC system_header _LIBCPP_BEGIN_NAMESPACE_STD -using ::rand; // #include <cstdlib> - template <class _T1, class _T2 = _T1> struct __equal_to { |
