diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 08:14:29 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 08:14:29 +0000 |
| commit | a315283caae2332644b329721fbd57de1fa842b3 (patch) | |
| tree | 4c1a15165256138f6f84c5222d82ddd19465a5ed /base | |
| parent | 857106789e05dae5f4020bb2034b73590055ab81 (diff) | |
| download | chromium_src-a315283caae2332644b329721fbd57de1fa842b3.zip chromium_src-a315283caae2332644b329721fbd57de1fa842b3.tar.gz chromium_src-a315283caae2332644b329721fbd57de1fa842b3.tar.bz2 | |
remove old check for vs2005 update, and replace with vs2012 update check
R=cpu@chromium.org
BUG=143646
Review URL: https://chromiumcodereview.appspot.com/12802003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/win_util.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/base/win/win_util.cc b/base/win/win_util.cc index 4c8efb9..8176bdd 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -331,15 +331,12 @@ bool DismissVirtualKeyboard() { } // namespace base #ifdef _MSC_VER -// -// If the ASSERT below fails, please install Visual Studio 2005 Service Pack 1. -// -extern char VisualStudio2005ServicePack1Detection[10]; -COMPILE_ASSERT(sizeof(&VisualStudio2005ServicePack1Detection) == sizeof(void*), - VS2005SP1Detect); -// -// Chrome requires at least Service Pack 1 for Visual Studio 2005. -// + +// There are optimizer bugs in VS2012 pre-Update 1. +#if _MSC_VER == 1700 && _MSC_FULL_VER < 170051106 +#error Must install Update 1 to Visual Studio 2012. +#endif + #endif // _MSC_VER #ifndef COPY_FILE_COPY_SYMLINK |