mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue of fold expressions test(#320,#321)

Browse Source
This commit is contained in:
Jinhao 2018-06-30 05:22:34 +08:00
parent d6590f88b0
commit 3d810fddac
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/gui/msgbox.hpp
View File

@ -255,7 +255,11 @@ namespace nana
bool show_modal(Args&& ... args) bool show_modal(Args&& ... args)
{ {
std::vector<abstract_content*> contents; std::vector<abstract_content*> contents;
#ifdef __cpp_fold_expressions
(contents.emplace_back(&args), ...);
#else
_m_fetch_args(contents, std::forward<Args>(args)...); _m_fetch_args(contents, std::forward<Args>(args)...);
#endif
if (contents.empty()) if (contents.empty())
return false; return false;

2
include/nana/internationalization.hpp
View File

@ -1,7 +1,7 @@
/* /*
* An Implementation of i18n * An Implementation of i18n
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at

4
source/gui/msgbox.cpp
View File

@ -1,7 +1,7 @@
/* /*
* A Message Box Class * A Message Box Class
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -1294,7 +1294,7 @@ namespace nana
min_width_entry_field_pixels_ = pixels; min_width_entry_field_pixels_ = pixels;
} }
#ifndef _nana_cxx_folding_expression #ifndef __cpp_fold_expressions
void inputbox::_m_fetch_args(std::vector<abstract_content*>&) void inputbox::_m_fetch_args(std::vector<abstract_content*>&)
{} {}
#endif #endif

2
source/internationalization.cpp
View File

@ -417,7 +417,7 @@ namespace nana
} }
} }
#ifndef _nana_cxx_folding_expression #ifndef __cpp_fold_expressions
void internationalization::_m_fetch_args(std::vector<std::string>&) void internationalization::_m_fetch_args(std::vector<std::string>&)
{} {}
#endif #endif