diff options
| author | Ben Caimano <ben.caimano@10gen.com> | 2019-05-27 19:30:03 -0400 |
|---|---|---|
| committer | Ben Caimano <ben.caimano@10gen.com> | 2019-05-27 19:30:03 -0400 |
| commit | 452c7f88eb3aa4da8637b875006f82e04d496865 (patch) | |
| tree | 7674b0bb480b91e7c80dba1e00c904af9cbbe030 | |
| parent | f5ca1b9e9b25d7e2870867936594140359adee67 (diff) | |
| download | mongo-452c7f88eb3aa4da8637b875006f82e04d496865.tar.gz | |
SERVER-39879 Fix unique_function constructor selection issues
| -rw-r--r-- | src/mongo/util/functional.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/util/functional.h b/src/mongo/util/functional.h index 5eb279b460c..58dd45505d1 100644 --- a/src/mongo/util/functional.h +++ b/src/mongo/util/functional.h @@ -98,7 +98,8 @@ public: std::enable_if_t<stdx::is_invocable_r<RetType, Functor, Args...>::value, TagType> = makeTag(), std::enable_if_t<std::is_move_constructible<Functor>::value, TagType> = makeTag(), - std::enable_if_t<!std::is_same<Functor, unique_function>::value, TagType> = makeTag()) + std::enable_if_t<!std::is_same<std::decay_t<Functor>, unique_function>::value, TagType> = + makeTag()) : impl(makeImpl(std::forward<Functor>(functor))) {} unique_function(std::nullptr_t) noexcept {} |