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 /base | |
| 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}
Diffstat (limited to 'base')
| -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 |
3 files changed, 1 insertions, 30 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 - |