0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build with VS2015 and VS2017

Browse source 
The problem was that overloads of config_construct_unpacker::visit() only
accepted certain parameters as rvalue references. Because they weren't
function templates (they were functions of a class template), type
deduction didn't occur and their parameters were rvalue references instead
of universal references.

See: https://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers
This commit is contained in:
Jyrki Vesterinen 2017-05-23 20:44:25 +03:00
parent fc422a7ac5
commit 57940f7405
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/config.hpp
View file

@ -777,7 +777,8 @@ namespace detail {
template<typename K, typename V, typename... Rest>
struct config_construct_unpacker<K, V, Rest...>
{
void visit(config& cfg, K&& key, V&& val, Rest... fwd)
template<typename K2 = K, typename V2 = V>
void visit(config& cfg, K2&& key, V2&& val, Rest... fwd)
{
cfg.insert(std::forward<K>(key), std::forward<V>(val));
config_construct_unpacker<Rest...> unpack;
@ -788,7 +789,8 @@ namespace detail {
template<typename T, typename... Rest>
struct config_construct_unpacker<T, config, Rest...>
{
void visit(config& cfg, T&& tag, config&& child, Rest... fwd)
template<typename T2 = T, typename C = config>
void visit(config& cfg, T2&& tag, C&& child, Rest... fwd)
{
cfg.add_child(std::forward<T>(tag), std::forward<config>(child));
config_construct_unpacker<Rest...> unpack;
@ -799,7 +801,8 @@ namespace detail {
template<typename T, typename... Rest>
struct config_construct_unpacker<T, config&, Rest...>
{
void visit(config& cfg, T&& tag, config& child, Rest... fwd)
template<typename T2 = T>
void visit(config& cfg, T2&& tag, config& child, Rest... fwd)
{
cfg.add_child(std::forward<T>(tag), std::forward<config>(child));
config_construct_unpacker<Rest...> unpack;