[PATCH] D93794: Fixed a build error when using CMake 3.15.1 + NDK-R20

[AnZhong Huang via Phabricator via llvm-commits]

azhuang updated this revision to Diff 314046.
azhuang added a comment.

Change the patch based on comments.

using BenchType = internal::LambdaBenchmark<typename std::decay<Lambda>::type>;
Should be a correct fix, but the previous change can also pass compiling :(


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D93794/new/

https://reviews.llvm.org/D93794

Files:
  llvm/utils/benchmark/include/benchmark/benchmark.h


Index: llvm/utils/benchmark/include/benchmark/benchmark.h
===================================================================
--- llvm/utils/benchmark/include/benchmark/benchmark.h
+++ llvm/utils/benchmark/include/benchmark/benchmark.h
@@ -990,7 +990,7 @@
 #ifdef BENCHMARK_HAS_CXX11
 template <class Lambda>
 internal::Benchmark* RegisterBenchmark(const char* name, Lambda&& fn) {
-  using BenchType = internal::LambdaBenchmark<std::decay_t<Lambda>>;
+  using BenchType = internal::LambdaBenchmark<typename std::decay<Lambda>::type>;
   return internal::RegisterBenchmarkInternal(
       ::new BenchType(name, std::forward<Lambda>(fn)));
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D93794.314046.patch
Type: text/x-patch
Size: 642 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201230/dd2a23b8/attachment.bin>