From 100283d43ea94e5afc4d0b22845c20876d82d6b9 Mon Sep 17 00:00:00 2001
From: qqiangwu <wqzhiep@gmail.com>
Date: Sun, 12 Apr 2015 12:05:59 +0800
Subject: [PATCH] minor fix

---
 CMakeLists.txt                          | 6 ++++++
 include/nana/std_condition_variable.hpp | 2 +-
 include/nana/std_mutex.hpp              | 2 +-
 include/nana/std_thread.hpp             | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b2b50f..fe2123ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,11 @@ if(BIICODE)
     endif(CMAKE_COMPILER_IS_GNUCXX)
 
     # 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()
     
@@ -52,6 +57,7 @@ if(WIN32)
 		add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
 		option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON)
 		if(NANA_THREAD_NOT_SUPPORTED)
+            add_definitions(-DNANA_NO_CPP11)    # so that deploy.hpp will compile
 			add_definitions(-DSTD_THREAD_NOT_SUPPORTED)
 		endif()
 	endif()
diff --git a/include/nana/std_condition_variable.hpp b/include/nana/std_condition_variable.hpp
index 7b64caa6..6b92ab16 100644
--- a/include/nana/std_condition_variable.hpp
+++ b/include/nana/std_condition_variable.hpp
@@ -2,7 +2,7 @@
 #define NANA_STD_CONDITION_VARIABLE_HPP
 #include <nana/config.hpp>
 
-#if NANA_NO_CPP11
+#if STD_THREAD_NOT_SUPPORTED
 
 #include <boost/thread/condition_variable.hpp>
 namespace std
diff --git a/include/nana/std_mutex.hpp b/include/nana/std_mutex.hpp
index 79120a3c..6cb500b9 100644
--- a/include/nana/std_mutex.hpp
+++ b/include/nana/std_mutex.hpp
@@ -2,7 +2,7 @@
 #define NANA_STD_MUTEX_HPP
 #include <nana/config.hpp>
 
-#if NANA_NO_CPP11
+#if STD_THREAD_NOT_SUPPORTED
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
diff --git a/include/nana/std_thread.hpp b/include/nana/std_thread.hpp
index 4b9f81b1..000bd20d 100644
--- a/include/nana/std_thread.hpp
+++ b/include/nana/std_thread.hpp
@@ -2,7 +2,7 @@
 #define NANA_STD_THREAD_HPP
 #include <nana/config.hpp>
 
-#if NANA_NO_CPP11
+#if STD_THREAD_NOT_SUPPORTED
 #include <boost/thread.hpp>
 namespace std
 {