diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
| commit | a04d78d392463df4e69a64360c952ffa5abd22f7 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/crypto/test/file_test.h | |
| parent | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff) | |
| download | external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2 | |
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.
This breaks some x86 builds.
Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/crypto/test/file_test.h')
| -rw-r--r-- | src/crypto/test/file_test.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/crypto/test/file_test.h b/src/crypto/test/file_test.h index 24651ab..7303d8a 100644 --- a/src/crypto/test/file_test.h +++ b/src/crypto/test/file_test.h @@ -18,19 +18,11 @@ #include <stdint.h> #include <stdio.h> -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable: 4702) -#endif - #include <string> #include <map> #include <set> #include <vector> -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // File-based test framework. // |