summaryrefslogtreecommitdiffstats
path: root/libcxx/include/functional
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-02-07 15:31:44 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-02-07 15:31:44 +0000
commitaba500d6335df7fe3a7cf45eb702de36bdd68749 (patch)
tree9e6694754545715720eaed8a6e59e1d435ebd6fa /libcxx/include/functional
parenteffd98b0f47e2bcb30e1e67305c753855dd897c3 (diff)
downloadbcm5719-llvm-aba500d6335df7fe3a7cf45eb702de36bdd68749.tar.gz
bcm5719-llvm-aba500d6335df7fe3a7cf45eb702de36bdd68749.zip
Revert accidental check-in. These changes are probably good, but premature at this point.
llvm-svn: 174625
Diffstat (limited to 'libcxx/include/functional')
-rw-r--r--libcxx/include/functional24
1 files changed, 0 insertions, 24 deletions
diff --git a/libcxx/include/functional b/libcxx/include/functional
index 9837a18e203..3bee1ed1a0a 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -465,10 +465,6 @@ POLICY: For non-variadic implementations, the number of arguments is limited
#include <memory>
#include <tuple>
-#if __OBJC__
-# include <Foundation/NSObject.h>
-#endif
-
#include <__functional_base>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -2024,26 +2020,6 @@ struct _LIBCPP_VISIBLE hash<long double>
}
};
-#if __OBJC__
-
-template <>
-struct _LIBCPP_VISIBLE hash<id>
- : public unary_function<id, size_t>
-{
- _LIBCPP_INLINE_VISIBILITY
- size_t operator()(id __v) const _NOEXCEPT {return [__v hash];}
-};
-
-template <>
-struct _LIBCPP_VISIBLE equal_to<id>
- : public binary_function<id, id, bool>
-{
- _LIBCPP_INLINE_VISIBILITY bool operator()(id __x, id __y) const
- {return __x == __y || [__x isEqual: __y];}
-};
-
-#endif // __OBJC__
-
// struct hash<T*> in <memory>
_LIBCPP_END_NAMESPACE_STD
OpenPOWER on IntegriCloud