forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-libs/msgpack: fix building with GCC-6.
Gentoo-Bug: https://bugs.gentoo.org/623492 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: gentoo#5206
- Loading branch information
1 parent
a82d114
commit 42a9bc1
Showing
2 changed files
with
27 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
Bug: https://bugs.gentoo.org/623492 | ||
Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de | ||
|
||
--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp | ||
+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp | ||
@@ -46,13 +46,14 @@ | ||
public: | ||
using base = std::tuple<Types...>; | ||
|
||
- using base::base; | ||
|
||
- tuple() = default; | ||
tuple(tuple const&) = default; | ||
tuple(tuple&&) = default; | ||
|
||
template<typename... OtherTypes> | ||
+ tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {} | ||
+ | ||
+ template<typename... OtherTypes> | ||
tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {} | ||
template<typename... OtherTypes> | ||
tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters