Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2013 Apple Inc. | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2013 Apple Inc. |
| 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 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 | 57 |
| 58 #include <type_traits> | 58 #include <type_traits> |
| 59 | 59 |
| 60 namespace blink { | 60 namespace blink { |
| 61 class TimerHeapReference; | 61 class TimerHeapReference; |
| 62 } | 62 } |
| 63 | 63 |
| 64 _LIBCPP_BEGIN_NAMESPACE_STD | 64 _LIBCPP_BEGIN_NAMESPACE_STD |
| 65 | 65 |
| 66 inline _LIBCPP_INLINE_VISIBILITY | 66 inline _LIBCPP_INLINE_VISIBILITY |
| 67 const blink::TimerHeapReference& move(const blink::TimerHeapReference& t) | 67 const TimerHeapReference& move(const TimerHeapReference& t) |
|
tkent
2015/04/29 20:22:36
Here is not in blink namespace. So we can't omit
| |
| 68 { | 68 { |
| 69 return t; | 69 return t; |
| 70 } | 70 } |
| 71 | 71 |
| 72 _LIBCPP_END_NAMESPACE_STD | 72 _LIBCPP_END_NAMESPACE_STD |
| 73 | 73 |
| 74 #endif // defined(_LIBCPP_VERSION) | 74 #endif // defined(_LIBCPP_VERSION) |
| 75 | 75 |
| 76 #include <algorithm> | 76 #include <algorithm> |
| 77 #include <cstddef> | 77 #include <cstddef> |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 96 #endif | 96 #endif |
| 97 | 97 |
| 98 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| | 98 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch| |
| 99 * to allow C++ code that expects exceptions to build. These definitions | 99 * to allow C++ code that expects exceptions to build. These definitions |
| 100 * interfere with Objective-C++ uses of Objective-C exception handlers, which | 100 * interfere with Objective-C++ uses of Objective-C exception handlers, which |
| 101 * use |@try| and |@catch|. As a workaround, undefine these macros. */ | 101 * use |@try| and |@catch|. As a workaround, undefine these macros. */ |
| 102 #ifdef __OBJC__ | 102 #ifdef __OBJC__ |
| 103 #undef try | 103 #undef try |
| 104 #undef catch | 104 #undef catch |
| 105 #endif | 105 #endif |
| OLD | NEW |