Merge branch 'VC2015_RC' of https://github.com/qPCR4vir/nana into qPCR4vir-VC2015_RC

Conflicts: include/nana/config.hpp
2015-06-10 07:26:41 +08:00
parent 62b55740df b1db4b2e14
commit feed286b53
6 changed files with 628 additions and 8 deletions
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -18,6 +18,7 @@
 	#define _SCL_SECURE_NO_WARNINGS
 	#define _CRT_SECURE_NO_DEPRECATE
    #pragma warning(disable : 4996)
+
 	#if (_MSC_VER < 1900)
        // is this a good idea?
        #define NOT_IMPLEMENTED_KEYWORD_noexcept