diff options
| author | Brian Smith <brian@briansmith.org> | 2015-01-29 03:20:02 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-01-31 03:18:55 +0300 |
| commit | efed2210e8e0c6b3db6c63e354f0c9b67673c712 (patch) | |
| tree | c13b45b9da0de9ac923e8f972cf3616ed02bb1d5 /tool | |
| parent | 0bb81fcd66609967b35ef1074d865716520f1dd4 (diff) | |
Enable more warnings & treat warnings as errors on Windows.
Change-Id: I2bf0144aaa8b670ff00b8e8dfe36bd4d237b9a8a
Reviewed-on: https://boringssl-review.googlesource.com/3140
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/args.cc | 1 | ||||
| -rw-r--r-- | tool/digest.cc | 5 | ||||
| -rw-r--r-- | tool/internal.h | 12 | ||||
| -rw-r--r-- | tool/speed.cc | 2 | ||||
| -rw-r--r-- | tool/transport_common.cc | 5 |
5 files changed, 21 insertions, 4 deletions
diff --git a/tool/args.cc b/tool/args.cc index 6cbfab65..52856d4d 100644 --- a/tool/args.cc +++ b/tool/args.cc @@ -14,7 +14,6 @@ #include <string> #include <vector> -#include <map> #include <stdio.h> #include <string.h> diff --git a/tool/digest.cc b/tool/digest.cc index f7ecda00..e75b168c 100644 --- a/tool/digest.cc +++ b/tool/digest.cc @@ -32,10 +32,11 @@ #endif #else #define NOMINMAX +#pragma warning(push, 3) #include <windows.h> +#pragma warning(pop) #include <io.h> #define PATH_MAX MAX_PATH -#define read _read typedef int ssize_t; #endif @@ -104,9 +105,11 @@ static bool OpenFile(int *out_fd, const std::string &filename) { *out_fd = fd; return true; +#if !defined(OPENSSL_WINDOWS) err: close(fd); return false; +#endif } // SumFile hashes the contents of |source| with |md| and sets |*out_hex| to the diff --git a/tool/internal.h b/tool/internal.h index 843dcdc6..bc87c518 100644 --- a/tool/internal.h +++ b/tool/internal.h @@ -17,8 +17,20 @@ #include <string> #include <vector> + +#if defined(_MSC_VER) +#pragma warning(push) +// MSVC issues warning C4702 for unreachable code in its xtree header when +// compiling with -D_HAS_EXCEPTIONS=0. See +// https://connect.microsoft.com/VisualStudio/feedback/details/809962 +#pragma warning(disable: 4702) +#endif + #include <map> +#if defined(_MSC_VER) +#pragma warning(pop) +#endif struct argument { const char name[15]; diff --git a/tool/speed.cc b/tool/speed.cc index 11747b1a..411f29e4 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -27,7 +27,9 @@ #include <openssl/rsa.h> #if defined(OPENSSL_WINDOWS) +#pragma warning(push, 3) #include <Windows.h> +#pragma warning(pop) #elif defined(OPENSSL_APPLE) #include <sys/time.h> #endif diff --git a/tool/transport_common.cc b/tool/transport_common.cc index 0f48703c..453ff5e3 100644 --- a/tool/transport_common.cc +++ b/tool/transport_common.cc @@ -32,11 +32,12 @@ #else #define NOMINMAX #include <io.h> +#pragma warning(push, 3) #include <WinSock2.h> #include <WS2tcpip.h> +#pragma warning(pop) + typedef int ssize_t; -#define read _read -#define write _write #pragma comment(lib, "Ws2_32.lib") #endif |