Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: third_party/WebKit/JavaScriptCore/wtf/HashTraits.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #ifndef WTF_HashTraits_h 21 #ifndef WTF_HashTraits_h
22 #define WTF_HashTraits_h 22 #define WTF_HashTraits_h
23 23
24 #include "Assertions.h"
24 #include "HashFunctions.h" 25 #include "HashFunctions.h"
25 #include "TypeTraits.h" 26 #include "TypeTraits.h"
26 #include <utility> 27 #include <utility>
27 #include <limits> 28 #include <limits>
28 29
29 namespace WTF { 30 namespace WTF {
30 31
31 using std::pair; 32 using std::pair;
32 using std::make_pair; 33 using std::make_pair;
33 34
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 107
107 template<typename First, typename Second> 108 template<typename First, typename Second>
108 struct HashTraits<pair<First, Second> > : public PairHashTraits<HashTraits<F irst>, HashTraits<Second> > { }; 109 struct HashTraits<pair<First, Second> > : public PairHashTraits<HashTraits<F irst>, HashTraits<Second> > { };
109 110
110 } // namespace WTF 111 } // namespace WTF
111 112
112 using WTF::HashTraits; 113 using WTF::HashTraits;
113 using WTF::PairHashTraits; 114 using WTF::PairHashTraits;
114 115
115 #endif // WTF_HashTraits_h 116 #endif // WTF_HashTraits_h
OLDNEW
« no previous file with comments | « third_party/WebKit/JavaScriptCore/JavaScriptCoreSources.bkl ('k') | third_party/WebKit/JavaScriptCore/wtf/MainThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698