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

minor fix

Browse Source
This commit is contained in:
qqiangwu 2015-04-12 12:05:59 +08:00
parent 79ec3c927d
commit 100283d43e
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -32,6 +32,11 @@ if(BIICODE)
endif(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX)
# we'll use the default config file so we can iliminate the following macro definitions # we'll use the default config file so we can iliminate the following macro definitions
if(MSVC)
# More MSVC specific compilation flags
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
endif()
add_biicode_targets() add_biicode_targets()
@ -52,6 +57,7 @@ if(WIN32)
add_definitions(-DSTD_CODECVT_NOT_SUPPORTED) add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON) option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON)
if(NANA_THREAD_NOT_SUPPORTED) if(NANA_THREAD_NOT_SUPPORTED)
add_definitions(-DNANA_NO_CPP11) # so that deploy.hpp will compile
add_definitions(-DSTD_THREAD_NOT_SUPPORTED) add_definitions(-DSTD_THREAD_NOT_SUPPORTED)
endif() endif()
endif() endif()

2
include/nana/std_condition_variable.hpp
View File

@ -2,7 +2,7 @@
#define NANA_STD_CONDITION_VARIABLE_HPP #define NANA_STD_CONDITION_VARIABLE_HPP
#include <nana/config.hpp> #include <nana/config.hpp>
#if NANA_NO_CPP11 #if STD_THREAD_NOT_SUPPORTED
#include <boost/thread/condition_variable.hpp> #include <boost/thread/condition_variable.hpp>
namespace std namespace std

2
include/nana/std_mutex.hpp
View File

@ -2,7 +2,7 @@
#define NANA_STD_MUTEX_HPP #define NANA_STD_MUTEX_HPP
#include <nana/config.hpp> #include <nana/config.hpp>
#if NANA_NO_CPP11 #if STD_THREAD_NOT_SUPPORTED
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp> #include <boost/thread/recursive_mutex.hpp>

2
include/nana/std_thread.hpp
View File

@ -2,7 +2,7 @@
#define NANA_STD_THREAD_HPP #define NANA_STD_THREAD_HPP
#include <nana/config.hpp> #include <nana/config.hpp>
#if NANA_NO_CPP11 #if STD_THREAD_NOT_SUPPORTED
#include <boost/thread.hpp> #include <boost/thread.hpp>
namespace std namespace std
{ {