Commit fb5e1207 authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

base: remove usage of _MSC_VER

Bug: 1053958
Change-Id: I4df58a6bc6d8b839239c7d56a7a7db1e54fcfd42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089433
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747241}
parent dab32d08
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#if _MSC_VER >= 1700
// C4752: found Intel(R) Advanced Vector Extensions; consider using /arch:AVX.
#pragma warning(disable: 4752)
#endif
// Tests whether we can run extended instructions represented by the CPU // Tests whether we can run extended instructions represented by the CPU
// information. This test actually executes some extended instructions (such as // information. This test actually executes some extended instructions (such as
// MMX, SSE, etc.) supported by the CPU and sees we can run them without // MMX, SSE, etc.) supported by the CPU and sees we can run them without
...@@ -110,8 +105,6 @@ TEST(CPU, RunExtendedInstructions) { ...@@ -110,8 +105,6 @@ TEST(CPU, RunExtendedInstructions) {
__asm popcnt eax, eax; __asm popcnt eax, eax;
} }
// Visual C 2012 required for AVX.
#if _MSC_VER >= 1700
if (cpu.has_avx()) { if (cpu.has_avx()) {
// Execute an AVX instruction. // Execute an AVX instruction.
__asm vzeroupper; __asm vzeroupper;
...@@ -121,7 +114,6 @@ TEST(CPU, RunExtendedInstructions) { ...@@ -121,7 +114,6 @@ TEST(CPU, RunExtendedInstructions) {
// Execute an AVX 2 instruction. // Execute an AVX 2 instruction.
__asm vpunpcklbw ymm0, ymm0, ymm0 __asm vpunpcklbw ymm0, ymm0, ymm0
} }
#endif // _MSC_VER >= 1700
#endif // defined(COMPILER_GCC) #endif // defined(COMPILER_GCC)
#endif // defined(ARCH_CPU_X86_FAMILY) #endif // defined(ARCH_CPU_X86_FAMILY)
} }
......
...@@ -186,9 +186,6 @@ TEST(StringPrintfTest, GrowBoundary) { ...@@ -186,9 +186,6 @@ TEST(StringPrintfTest, GrowBoundary) {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
// vswprintf in Visual Studio 2013 fails when given U+FFFF. This tests that the
// failure case is gracefuly handled. In Visual Studio 2015 the bad character
// is passed through.
TEST(StringPrintfTest, Invalid) { TEST(StringPrintfTest, Invalid) {
wchar_t invalid[2]; wchar_t invalid[2];
invalid[0] = 0xffff; invalid[0] = 0xffff;
...@@ -196,11 +193,7 @@ TEST(StringPrintfTest, Invalid) { ...@@ -196,11 +193,7 @@ TEST(StringPrintfTest, Invalid) {
std::wstring out; std::wstring out;
SStringPrintf(&out, L"%ls", invalid); SStringPrintf(&out, L"%ls", invalid);
#if _MSC_VER >= 1900
EXPECT_STREQ(invalid, out.c_str()); EXPECT_STREQ(invalid, out.c_str());
#else
EXPECT_STREQ(L"", out.c_str());
#endif
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment