Simplify CMake file and config.h

This commit is contained in:
qPCR4vir
2015-12-03 16:54:13 +01:00
parent f9f70cf08b
commit 3ad8f5a641
13 changed files with 171 additions and 116 deletions

View File

@@ -21,7 +21,7 @@
#include <map>
#include <algorithm>
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_thread.hpp>
#include <nana/std_mutex.hpp>
#include <nana/std_condition_variable.hpp>
@@ -29,7 +29,7 @@
#include <mutex>
#include <condition_variable>
#include <thread>
#endif //NANA_MINGW
#endif // STD_THREAD_NOT_SUPPORTED
namespace nana
{

View File

@@ -14,7 +14,7 @@
#include <nana/gui/detail/native_window_interface.hpp>
#include <nana/gui/screen.hpp>
#if defined(NANA_WINDOWS)
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp>
#else
#include <mutex>

View File

@@ -20,7 +20,7 @@
#include <unordered_map>
#include <unordered_set>
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp>
#else
#include <mutex>

View File

@@ -95,13 +95,13 @@ namespace nana
std::string pos_str() const
{
#ifdef NANA_MINGW
#ifdef UNDEFINED_to_string
std::stringstream ss;
ss<<pos();
return ss.str();
#else
return std::to_string(pos());
#endif // NANA_MINGW
#endif // UNDEFINED_to_string
}
token read()

View File

@@ -19,7 +19,7 @@
#include <map>
#include <memory>
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp>
#else
#include <mutex>