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

Merge branch 'hotfix-1.7.2' into develop

Browse Source
This commit is contained in:
Jinhao
2019-09-11 00:54:47 +08:00
parent 6cde88b783 1e65dd8d66
commit a65eec2bb9
16 changed files with 224 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@
#define NANA_MINGW
#endif // MINGW
#elif defined(APPLE) //Mac OS X
#elif defined(__APPLE__) || defined(APPLE) //Mac OS X
//Symbols for MACOS
#define NANA_MACOS
#define NANA_POSIX
@@ -252,7 +252,7 @@
# if __has_include(<filesystem>)
# undef STD_FILESYSTEM_NOT_SUPPORTED
# endif
# if __has_include(<mutex>)
# if __has_include(<mutex>)
# if !(defined(NANA_MINGW) && !defined(_GLIBCXX_HAS_GTHREADS))
//See the comment above regarding MinGW's threading support
# undef STD_THREAD_NOT_SUPPORTED

4
include/nana/filesystem/filesystem.hpp
View File

@@ -560,7 +560,7 @@ namespace std {
#endif
}
} // std
#else
#else //#if NANA_USING_NANA_FILESYSTEM
//Implements the missing functions for various version of experimental/filesystem
namespace std
{
@@ -568,7 +568,7 @@ namespace std {
{
//Visual Studio 2017
#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603))
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801)))
path weakly_canonical(const path& p);
path weakly_canonical(const path& p, std::error_code& err);
#endif

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

@@ -48,7 +48,7 @@ namespace nana
template<typename Function>
void elapse(Function && fn)
{
elapse_.connect(std::forward<Function>(fn));
elapse_->connect(std::forward<Function>(fn));
}
void reset();
@@ -66,7 +66,7 @@ namespace nana
private:
unsigned _m_interval() const;
private:
nana::basic_event<arg_elapse> elapse_;
std::shared_ptr<nana::basic_event<arg_elapse>> elapse_;
implement * const impl_;
};
}//end namespace nana