susumu.yata
null+****@clear*****
Thu Nov 29 12:15:10 JST 2012
susumu.yata 2012-11-29 12:15:10 +0900 (Thu, 29 Nov 2012) New Revision: afd157d12ea48d640a2ae59205c3614331a17339 https://github.com/groonga/grnxx/commit/afd157d12ea48d640a2ae59205c3614331a17339 Log: Insert "#define NOMINMAX" before "#include <windows.h>". To prevent windows.h from defining min/max macros. Modified files: lib/error.cpp lib/io/file-windows.hpp lib/io/view-windows.hpp lib/thread.cpp Modified: lib/error.cpp (+3 -0) =================================================================== --- lib/error.cpp 2012-11-28 17:04:23 +0900 (af13207) +++ lib/error.cpp 2012-11-29 12:15:10 +0900 (1f419e3) @@ -18,6 +18,9 @@ #include "error.hpp" #ifdef GRNXX_WINDOWS +# ifndef NOMINMAX +# define NOMINMAX +# endif // NOMINMAX # include <windows.h> #endif // GRNXX_WINDOWS Modified: lib/io/file-windows.hpp (+3 -0) =================================================================== --- lib/io/file-windows.hpp 2012-11-28 17:04:23 +0900 (3144a5b) +++ lib/io/file-windows.hpp 2012-11-29 12:15:10 +0900 (9c85eca) @@ -22,6 +22,9 @@ #ifdef GRNXX_WINDOWS +#ifndef NOMINMAX +# define NOMINMAX +#endif // NOMINMAX #include <windows.h> namespace grnxx { Modified: lib/io/view-windows.hpp (+3 -0) =================================================================== --- lib/io/view-windows.hpp 2012-11-28 17:04:23 +0900 (929efe2) +++ lib/io/view-windows.hpp 2012-11-29 12:15:10 +0900 (59787df) @@ -22,6 +22,9 @@ #ifdef GRNXX_WINDOWS +#ifndef NOMINMAX +# define NOMINMAX +#endif // NOMINMAX #include <windows.h> namespace grnxx { Modified: lib/thread.cpp (+3 -0) =================================================================== --- lib/thread.cpp 2012-11-28 17:04:23 +0900 (b1a5412) +++ lib/thread.cpp 2012-11-29 12:15:10 +0900 (c00aae6) @@ -18,6 +18,9 @@ #include "thread.hpp" #ifdef GRNXX_WINDOWS +# ifndef NOMINMAX +# define NOMINMAX +# endif // NOMINMAX # include <windows.h> #endif // GRNXX_WINDOWS -------------- next part -------------- HTML����������������������������...Download
