fix mingw compiling errors
Manually merge the commit which is created by Pr0curo
This commit is contained in:
parent
ce98ffa7b1
commit
2c5283eb78
@ -18,6 +18,8 @@
|
||||
#endif
|
||||
#include <algorithm>
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
namespace nana
|
||||
{
|
||||
//class color
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Implementation of Notifier
|
||||
* Nana C++ Library(http://www.nanapro.org)
|
||||
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
|
||||
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
|
||||
*
|
||||
* Distributed under the Boost Software License, Version 1.0.
|
||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||
@ -16,7 +16,12 @@
|
||||
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
|
||||
#include <nana/std_mutex.hpp>
|
||||
#else
|
||||
#include <mutex>
|
||||
#endif
|
||||
|
||||
#if defined(NANA_WINDOWS)
|
||||
#include <nana/detail/win32/platform_spec.hpp>
|
||||
|
Loading…
x
Reference in New Issue
Block a user