From: Chris Lattner <sabre@nondot.org>
Date: Mon, 1 Dec 2008 19:45:45 +0000 (+0000)
Subject: don't #include <algorithm> into the llvm namespace.
X-Git-Tag: android-x86-6.0-r1~1003^2~24148
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b6113c6e2f23f3bf8b2505bf13bc15b4995c82a;p=android-x86%2Fexternal-llvm.git

don't #include <algorithm> into the llvm namespace.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60365 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index 7be7699bcc2..a9e195e1256 100644
--- a/include/llvm/ADT/STLExtras.h
+++ b/include/llvm/ADT/STLExtras.h
@@ -246,7 +246,9 @@ static inline int array_pod_sort_comparator(const void *P1, const void *P2) {
 ///
 /// NOTE: If qsort_r were portable, we could allow a custom comparator and
 /// default to std::less.
+}
 #include <algorithm>
+namespace llvm {
   
 template<class IteratorTy>
 static inline void array_pod_sort(IteratorTy Start, IteratorTy End) {