summaryrefslogtreecommitdiffstats
path: root/llvm/include
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2017-03-23 21:02:31 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2017-03-23 21:02:31 +0000
commit63dee972182d32080d509e343e1408a78a59d27b (patch)
tree70740165b3fbf1c2e67baebf9c3ab1f3ee4c56ea /llvm/include
parent74494d017998436694da3ebc8af7cf7772d8cb48 (diff)
downloadbcm5719-llvm-63dee972182d32080d509e343e1408a78a59d27b.tar.gz
bcm5719-llvm-63dee972182d32080d509e343e1408a78a59d27b.zip
Remove unnecessary use of std::result_of, which is deprecated in C++17.
llvm-svn: 298645
Diffstat (limited to 'llvm/include')
-rw-r--r--llvm/include/llvm/ADT/STLExtras.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
index 2d475e10738..15945adbe58 100644
--- a/llvm/include/llvm/ADT/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -140,9 +140,8 @@ public:
iterator_category;
typedef typename std::iterator_traits<RootIt>::difference_type
difference_type;
- typedef typename std::result_of<
- UnaryFunc(decltype(*std::declval<RootIt>()))>
- ::type value_type;
+ typedef decltype(std::declval<UnaryFunc>()(*std::declval<RootIt>()))
+ value_type;
typedef void pointer;
//typedef typename UnaryFunc::result_type *pointer;
OpenPOWER on IntegriCloud