From f79f486ecd399ed82fd2cf9445f99c810bf4d7c1 Mon Sep 17 00:00:00 2001 From: "adamk@chromium.org" Date: Thu, 16 Feb 2012 16:52:42 +0000 Subject: Eliminate VS2010 ifdefs for handling NULL in std::pair. Remove lots of duplicated ifdefs, replacing them with syntax that works on all platforms (including VS2010). BUG=106215 Review URL: https://chromiumcodereview.appspot.com/8735002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122303 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/blob/deletable_file_reference.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'webkit/blob') diff --git a/webkit/blob/deletable_file_reference.cc b/webkit/blob/deletable_file_reference.cc index 4a5665d..78cfafb 100644 --- a/webkit/blob/deletable_file_reference.cc +++ b/webkit/blob/deletable_file_reference.cc @@ -35,14 +35,8 @@ scoped_refptr DeletableFileReference::GetOrCreate( DCHECK(file_thread); typedef std::pair InsertResult; - // Visual Studio 2010 has problems converting NULL to the null pointer for - // std::pair. See http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair - // It will work if we pass nullptr. -#if defined(_MSC_VER) && _MSC_VER >= 1600 - webkit_blob::DeletableFileReference* null_reference = nullptr; -#else + // Required for VS2010: http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair webkit_blob::DeletableFileReference* null_reference = NULL; -#endif InsertResult result = g_deletable_file_map.Get().insert( DeleteableFileMap::value_type(path, null_reference)); if (result.second == false) -- cgit v1.1