diff options
author | mostynb <mostynb@opera.com> | 2014-12-19 04:47:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 12:48:35 +0000 |
commit | 7e42a8f70f08bb903ba610afd573ebbfdce5a1d6 (patch) | |
tree | c5b002e3afe428f3f781a85f02f04153b87b135a | |
parent | c95780419a4c972b6017eee18a435a0fe1e3e8e0 (diff) | |
download | chromium_src-7e42a8f70f08bb903ba610afd573ebbfdce5a1d6.zip chromium_src-7e42a8f70f08bb903ba610afd573ebbfdce5a1d6.tar.gz chromium_src-7e42a8f70f08bb903ba610afd573ebbfdce5a1d6.tar.bz2 |
remove some dead visual studio < 2013 code
We only support building for windows with Visual Studio 2013 Update 4
now, so let's remove dead code that is only used for older Visual
Studio versions.
BUG=442035,158570
Review URL: https://codereview.chromium.org/798163004
Cr-Commit-Position: refs/heads/master@{#309187}
-rw-r--r-- | base/atomicops_internals_x86_msvc.h | 3 | ||||
-rw-r--r-- | base/logging.cc | 2 | ||||
-rw-r--r-- | base/win/win_util.cc | 26 | ||||
-rw-r--r-- | chrome/app/delay_load_hook_unittest_win.cc | 5 | ||||
-rw-r--r-- | chrome/app/delay_load_hook_win.cc | 5 | ||||
-rw-r--r-- | components/crash/app/hard_error_handler_win.cc | 5 | ||||
-rw-r--r-- | content/browser/media/media_browsertest.cc | 25 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_init_win.h | 4 | ||||
-rw-r--r-- | jingle/notifier/base/xmpp_connection_unittest.cc | 4 | ||||
-rw-r--r-- | media/cdm/ppapi/cdm_logging.cc | 2 | ||||
-rw-r--r-- | third_party/leveldatabase/port/port_chromium.h | 3 |
11 files changed, 13 insertions, 71 deletions
diff --git a/base/atomicops_internals_x86_msvc.h b/base/atomicops_internals_x86_msvc.h index 0269d89..26f1813 100644 --- a/base/atomicops_internals_x86_msvc.h +++ b/base/atomicops_internals_x86_msvc.h @@ -55,9 +55,6 @@ inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, return Barrier_AtomicIncrement(ptr, increment); } -#if !(defined(_MSC_VER) && _MSC_VER >= 1400) -#error "We require at least vs2005 for MemoryBarrier" -#endif inline void MemoryBarrier() { #if defined(ARCH_CPU_64_BITS) // See #undef and note at the top of this file. diff --git a/base/logging.cc b/base/logging.cc index 327ac77..5d65fa5 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -659,7 +659,7 @@ void LogMessage::Init(const char* file, int line) { if (log_timestamp) { time_t t = time(NULL); struct tm local_time = {0}; -#if _MSC_VER >= 1400 +#ifdef _MSC_VER localtime_s(&local_time, &t); #else localtime_r(&t, &local_time); diff --git a/base/win/win_util.cc b/base/win/win_util.cc index f46242d3..a3c9ece 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -448,29 +448,3 @@ bool MaybeHasSHA256Support() { } // namespace win } // namespace base - -#ifdef _MSC_VER - -// There are optimizer bugs in x86 VS2012 pre-Update 1. -#if _MSC_VER == 1700 && defined _M_IX86 && _MSC_FULL_VER < 170051106 - -#pragma message("Relevant defines:") -#define __STR2__(x) #x -#define __STR1__(x) __STR2__(x) -#define __PPOUT__(x) "#define " #x " " __STR1__(x) -#if defined(_M_IX86) - #pragma message(__PPOUT__(_M_IX86)) -#endif -#if defined(_M_X64) - #pragma message(__PPOUT__(_M_X64)) -#endif -#if defined(_MSC_FULL_VER) - #pragma message(__PPOUT__(_MSC_FULL_VER)) -#endif - -#pragma message("Visual Studio 2012 x86 must be updated to at least Update 1") -#error Must install Update 1 to Visual Studio 2012. -#endif - -#endif // _MSC_VER - diff --git a/chrome/app/delay_load_hook_unittest_win.cc b/chrome/app/delay_load_hook_unittest_win.cc index 1fc62d3..ed2adf8 100644 --- a/chrome/app/delay_load_hook_unittest_win.cc +++ b/chrome/app/delay_load_hook_unittest_win.cc @@ -3,11 +3,6 @@ // found in the LICENSE file. #include <windows.h> -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in -// delayimp.h previous to VS2012. -#undef FACILITY_VISUALCPP -#endif #include <DelayIMP.h> #include "base/basictypes.h" diff --git a/chrome/app/delay_load_hook_win.cc b/chrome/app/delay_load_hook_win.cc index f85488b..e81407c 100644 --- a/chrome/app/delay_load_hook_win.cc +++ b/chrome/app/delay_load_hook_win.cc @@ -4,11 +4,6 @@ #include "chrome/app/delay_load_hook_win.h" -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in -// delayimp.h previous to VS2012. -#undef FACILITY_VISUALCPP -#endif #include <DelayIMP.h> #include "base/logging.h" diff --git a/components/crash/app/hard_error_handler_win.cc b/components/crash/app/hard_error_handler_win.cc index 50425e9..a4050d2 100644 --- a/components/crash/app/hard_error_handler_win.cc +++ b/components/crash/app/hard_error_handler_win.cc @@ -4,11 +4,6 @@ #include "components/crash/app/hard_error_handler_win.h" -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in -// delayimp.h previous to VS2012. -#undef FACILITY_VISUALCPP -#endif #include <DelayIMP.h> #include <winternl.h> diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index 46f7a49..7442c47 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc @@ -13,13 +13,6 @@ #include "media/base/test_data_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" -// TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 -#if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 -#define MAYBE(x) DISABLED_##x -#else -#define MAYBE(x) x -#endif - namespace content { // Common test results. @@ -238,40 +231,40 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pTheora) { RunColorFormatTest("yuv420p.ogv", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pTheora) { RunColorFormatTest("yuv422p.ogv", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pTheora) { RunColorFormatTest("yuv444p.ogv", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pVp8) { RunColorFormatTest("yuv420p.webm", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pVp9) { RunColorFormatTest("yuv444p.webm", "ENDED"); } #if defined(USE_PROPRIETARY_CODECS) -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pH264) { RunColorFormatTest("yuv420p.mp4", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuvj420pH264) { RunColorFormatTest("yuvj420p.mp4", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pH264) { RunColorFormatTest("yuv422p.mp4", kEnded); } -IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { +IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pH264) { RunColorFormatTest("yuv444p.mp4", kEnded); } diff --git a/device/bluetooth/bluetooth_init_win.h b/device/bluetooth/bluetooth_init_win.h index ac8f7f0..b3a505e 100644 --- a/device/bluetooth/bluetooth_init_win.h +++ b/device/bluetooth/bluetooth_init_win.h @@ -9,10 +9,6 @@ #include <windows.h> #include <BluetoothAPIs.h> -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h. -#undef FACILITY_VISUALCPP -#endif #include <delayimp.h> #include <ws2def.h> #include <ws2bth.h> diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index 682c8d1..2e62092 100644 --- a/jingle/notifier/base/xmpp_connection_unittest.cc +++ b/jingle/notifier/base/xmpp_connection_unittest.cc @@ -103,7 +103,7 @@ TEST_F(XmppConnectionTest, CreateDestroy) { &mock_xmpp_connection_delegate_, NULL); } -#if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570 +#if !defined(_MSC_VER) // http://crbug.com/158570 TEST_F(XmppConnectionTest, ImmediateFailure) { // ChromeAsyncSocket::Connect() will always return false since we're // not setting a valid host, but this gets bubbled up as ERROR_NONE @@ -210,7 +210,7 @@ TEST_F(XmppConnectionTest, MultipleConnect) { }, "more than once"); } -#if !defined(_MSC_VER) || _MSC_VER < 1700 // http://crbug.com/158570 +#if !defined(_MSC_VER) // http://crbug.com/158570 TEST_F(XmppConnectionTest, ConnectThenError) { base::WeakPtr<rtc::Task> weak_ptr; EXPECT_CALL(mock_xmpp_connection_delegate_, OnConnect(_)). diff --git a/media/cdm/ppapi/cdm_logging.cc b/media/cdm/ppapi/cdm_logging.cc index 02383fc..117db5e 100644 --- a/media/cdm/ppapi/cdm_logging.cc +++ b/media/cdm/ppapi/cdm_logging.cc @@ -102,7 +102,7 @@ CdmLogMessage::CdmLogMessage(const char* file, int line) { // Time and tick count. time_t t = time(NULL); struct tm local_time = {0}; -#if _MSC_VER >= 1400 +#ifdef _MSC_VER localtime_s(&local_time, &t); #else localtime_r(&t, &local_time); diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h index 4a4a29a..3548d62 100644 --- a/third_party/leveldatabase/port/port_chromium.h +++ b/third_party/leveldatabase/port/port_chromium.h @@ -23,9 +23,6 @@ #if defined(OS_WIN) #define snprintf _snprintf typedef SSIZE_T ssize_t; -#if !defined(__clang__) && _MSC_VER <= 1700 -# define va_copy(a, b) do { (a) = (b); } while (0) -#endif #endif namespace leveldb { |