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

fix mingw compiling errors

Browse Source 
Manually merge the commit which is created by Pr0curo
This commit is contained in:
Jinhao 2015-03-10 13:30:15 +08:00
parent ce98ffa7b1
commit 2c5283eb78
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/basic_types.cpp
View File

@ -18,6 +18,8 @@
#endif #endif
#include <algorithm> #include <algorithm>
#include <stdexcept>
namespace nana namespace nana
{ {
//class color //class color

7
source/gui/notifier.cpp
View File

@ -1,7 +1,7 @@
/* /*
* Implementation of Notifier * Implementation of Notifier
* Nana C++ Library(http://www.nanapro.org) * 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. * 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
@ -16,7 +16,12 @@
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp>
#else
#include <mutex> #include <mutex>
#endif
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <nana/detail/win32/platform_spec.hpp> #include <nana/detail/win32/platform_spec.hpp>