From 28697d645f62d93d61f86e42cd5da2e0d5ad1ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=93=E8=88=AA?= <1210603696@qq.com> Date: Wed, 5 Nov 2014 10:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0stl=E7=9A=84pair=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=88=90TinySTL=E7=9A=84pair?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TinySTL/Algorithm.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/TinySTL/Algorithm.h b/TinySTL/Algorithm.h index 72c4a48..6d9d98f 100644 --- a/TinySTL/Algorithm.h +++ b/TinySTL/Algorithm.h @@ -5,6 +5,7 @@ #include "Functional.h" #include "Iterator.h" #include "TypeTraits.h" +#include "Utility.h" #include #include @@ -349,23 +350,23 @@ namespace TinySTL{ //********** [mismatch] ****************************** //********* [Algorithm Complexity: O(N)] **************** template - std::pair + pair mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2){ for (; first1 != last1; ++first1, ++first2){ if (*first1 != *first2) break; } - return std::make_pair(first1, first2); + return make_pair(first1, first2); } template - std::pair + pair mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate pred){ for (; first1 != last1; ++first1, ++first2){ if (!pred(*first1, *first2)) break; } - return std::make_pair(first1, first2); + return make_pair(first1, first2); } }