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

fix bug of C++ feature detection(#338)

Browse Source
This commit is contained in:
Jinhao 2018-09-25 02:07:15 +08:00
parent 7fea766f99
commit 2c3d75c709
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/c++defines.hpp
View File

@ -211,10 +211,10 @@
#undef _nana_std_optional #undef _nana_std_optional
#if ((defined(_MSC_VER) && (_MSC_VER >= 1912) && ((!defined(_MSVC_LANG)) || _MSVC_LANG < 201703))) || \ #if ((defined(_MSC_VER) && ((!defined(_MSVC_LANG)) || _MSVC_LANG < 201703))) || \
((__cplusplus < 201703L) || \ ((!defined(_MSC_VER)) && ((__cplusplus < 201703L) || \
(defined(__clang__) && (__clang_major__ * 100 + __clang_minor__ < 400)) || \ (defined(__clang__) && (__clang_major__ * 100 + __clang_minor__ < 400)) || \
(!defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 701)) \ (!defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 701))) \
) )
# define _nana_std_optional # define _nana_std_optional
#endif #endif

2
source/gui/widgets/label.cpp
View File

@ -303,7 +303,7 @@ namespace nana
extent_size.width = width_px; extent_size.width = width_px;
for (auto & vsline : rs.vslines) for (auto & vsline : rs.vslines)
extent_size.height += vsline.extent_height_px; extent_size.height += static_cast<size::value_type>(vsline.extent_height_px);
content_lines.emplace_back(std::move(rs.vslines)); content_lines.emplace_back(std::move(rs.vslines));