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

modify some symbols in config.hpp

Browse Source
This commit is contained in:
Jinhao 2016-01-21 00:30:08 +08:00
parent 27367804a2
commit b961ff51d7
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@
* - STD_CODECVT_NOT_SUPPORTED (VC RC, <codecvt> is a known issue on libstdc++, it works on libc++) * - STD_CODECVT_NOT_SUPPORTED (VC RC, <codecvt> is a known issue on libstdc++, it works on libc++)
* - STD_THREAD_NOT_SUPPORTED (GCC < 4.8.1) * - STD_THREAD_NOT_SUPPORTED (GCC < 4.8.1)
* - STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1) * - STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1)
* - USE_github_com_meganz_mingw_std_threads (MinGW with GCC < 4.8.1)
* - STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1) * - STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1)
* - STD_TO_STRING_NOT_SUPPORTED (MinGW with GCC < 4.8) * - STD_TO_STRING_NOT_SUPPORTED (MinGW with GCC < 4.8)
* - VERBOSE_PREPROCESSOR, STOP_VERBOSE_PREPROCESSOR * - VERBOSE_PREPROCESSOR, STOP_VERBOSE_PREPROCESSOR
@ -123,14 +122,6 @@
#if (__GNUC__ == 4) #if (__GNUC__ == 4)
#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1)) #if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
#define STD_THREAD_NOT_SUPPORTED #define STD_THREAD_NOT_SUPPORTED
//boost.thread is preferred
//but if USE_github_com_meganz_mingw_std_threads is enabled,
//boost.thread will be replaced with meganz's mingw-std-threads.
// https://github.com/meganz/mingw-std-threads
#if !defined( USE_github_com_meganz_mingw_std_threads )
//#define USE_github_com_meganz_mingw_std_threads
#endif
#endif #endif
#if (__GNUC_MINOR__ < 9) #if (__GNUC_MINOR__ < 9)

8
include/nana/config.hpp
View File

@ -23,6 +23,14 @@
// Here defines some flags that tell Nana what features will be supported. // Here defines some flags that tell Nana what features will be supported.
//Support of std::thread
//Boost.Thread is preferred.
//NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ is only available on MinGW when STD_THREAD_NOT_SUPPORTED is defined.
//if NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ is enabled, Boost.Thread will be replaced with meganz's mingw-std-threads.
//https://github.com/meganz/mingw-std-threads
//#define NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ
/////////////////// ///////////////////
//Support for PNG //Support for PNG
// Define the NANA_ENABLE_PNG to enable the support of PNG. // Define the NANA_ENABLE_PNG to enable the support of PNG.

4
include/nana/std_condition_variable.hpp
View File

@ -3,7 +3,7 @@
#include <nana/config.hpp> #include <nana/config.hpp>
#if defined(STD_THREAD_NOT_SUPPORTED) #if defined(STD_THREAD_NOT_SUPPORTED)
#if defined(USE_github_com_meganz_mingw_std_threads) #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#include <mingw.condition_variable.h> #include <mingw.condition_variable.h>
#else #else
#include <boost/thread/condition_variable.hpp> #include <boost/thread/condition_variable.hpp>
@ -11,6 +11,6 @@ namespace std
{ {
typedef boost::condition_variable condition_variable; typedef boost::condition_variable condition_variable;
} }
#endif // (USE_github_com_meganz_mingw_std_threads) #endif // (NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#endif // (STD_THREAD_NOT_SUPPORTED) #endif // (STD_THREAD_NOT_SUPPORTED)
#endif // NANA_STD_CONDITION_VARIABLE_HPP #endif // NANA_STD_CONDITION_VARIABLE_HPP

4
include/nana/std_mutex.hpp
View File

@ -4,7 +4,7 @@
#if defined(STD_THREAD_NOT_SUPPORTED) #if defined(STD_THREAD_NOT_SUPPORTED)
#if defined(USE_github_com_meganz_mingw_std_threads) #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#include <windows.h> #include <windows.h>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
@ -32,6 +32,6 @@ namespace std
typedef boost::mutex mutex; typedef boost::mutex mutex;
typedef boost::recursive_mutex recursive_mutex; typedef boost::recursive_mutex recursive_mutex;
} }
#endif // (USE_github_com_meganz_mingw_std_threads) #endif // (NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#endif // (STD_THREAD_NOT_SUPPORTED) #endif // (STD_THREAD_NOT_SUPPORTED)
#endif // NANA_STD_MUTEX_HPP #endif // NANA_STD_MUTEX_HPP

4
include/nana/std_thread.hpp
View File

@ -4,7 +4,7 @@
#if defined(STD_THREAD_NOT_SUPPORTED) #if defined(STD_THREAD_NOT_SUPPORTED)
#if defined(USE_github_com_meganz_mingw_std_threads) #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#include <mingw.thread.h> #include <mingw.thread.h>
#else #else
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -12,6 +12,6 @@ namespace std
{ {
typedef boost::thread thread; typedef boost::thread thread;
} }
#endif // (USE_github_com_meganz_mingw_std_threads) #endif // (NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#endif // (STD_THREAD_NOT_SUPPORTED) #endif // (STD_THREAD_NOT_SUPPORTED)
#endif // NANA_STD_THREAD_HPP #endif // NANA_STD_THREAD_HPP