From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 23 Mar 2017 21:02:31 +0000 (+0000)
Subject: Remove unnecessary use of std::result_of, which is deprecated in C++17.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=496710d9de9acc2ccd233ad81cd73035bb6cab7f;p=llvm

Remove unnecessary use of std::result_of, which is deprecated in C++17.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298645 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index 2d475e10738..15945adbe58 100644
--- a/include/llvm/ADT/STLExtras.h
+++ b/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;