Skip to content

Commit 41a2ce9

Browse files
committed
Merge bitcoin/bitcoin#31464: util: Add missing types in make_secure_unique
fa39717 util: Add missing types in make_secure_unique (MarcoFalke) Pull request description: The return type of `std::forward` depends on the template type, and can not be recovered from the args. Attempting to do so will result in a compile failure. For example, `make_secure_unique<std::string>(std::string{});` does not compile on current master, but does with this pull. Another example would be `make_secure_unique<std::pair<std::string, std::unique_ptr<int>>>(std::string{}, std::make_unique<int>(21));` ACKs for top commit: hodlinator: ACK fa39717 hebasto: ACK fa39717. TheCharlatan: ACK fa39717 Tree-SHA512: cc902c1111c929a79a6f806b5097136a465e8c727474176bad30a5777ebbb30bedb0bd35273b43bf839d2c00492500ddec724bd17349250451f6b329cb71e6f2
2 parents 6475849 + fa39717 commit 41a2ce9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/support/allocators/secure.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2021 The Bitcoin Core developers
2+
// Copyright (c) 2009-present The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -74,7 +74,7 @@ secure_unique_ptr<T> make_secure_unique(Args&&... as)
7474

7575
// initialize in place, and return as secure_unique_ptr
7676
try {
77-
return secure_unique_ptr<T>(new (p) T(std::forward(as)...));
77+
return secure_unique_ptr<T>(new (p) T(std::forward<Args>(as)...));
7878
} catch (...) {
7979
secure_allocator<T>().deallocate(p, 1);
8080
throw;

0 commit comments

Comments
 (0)