diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:36:34 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:36:34 +0000 |
| commit | 7b7965f2391594e6a3944ffee8fcdaaf18683fc3 (patch) | |
| tree | c18a2c07457f2c415df42ed31827b46ec9f4611e | |
| parent | 901f2f391336b19c99e420e728329ab0543b5db9 (diff) | |
| download | chromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.zip chromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.tar.gz chromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.tar.bz2 | |
Replace pragma with MSVC macros
Review URL: http://codereview.chromium.org/6212
Patch from icefox.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3345 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/cpp_bound_class.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/resource_handle_win.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index 5e2bc4b..3b5aed7 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -14,13 +14,16 @@ #include "config.h" +#include "base/compiler_specific.h" + #include "webkit/glue/cpp_bound_class.h" #include "webkit/glue/webframe.h" // This is required for the KJS build due to an artifact of the // npruntime_priv.h file from JavaScriptCore/bindings. -#pragma warning(disable:4067) +MSVC_PUSH_DISABLE_WARNING(4067) #include "npruntime_priv.h" +MSVC_POP_WARNING() #if USE(JSC) #pragma warning(push, 0) diff --git a/webkit/glue/resource_handle_win.cc b/webkit/glue/resource_handle_win.cc index c7642e2..23c3ba2 100644 --- a/webkit/glue/resource_handle_win.cc +++ b/webkit/glue/resource_handle_win.cc @@ -256,7 +256,7 @@ ResourceHandleInternal::ResourceHandleInternal(ResourceHandle* job, pending_(false), expected_content_length_(-1), multipart_delegate_(NULL), -#pragma warning(suppress: 4355) // can use this +MSVC_SUPPRESS_WARNING(4355) // can use this data_url_factory_(this) { } @@ -612,7 +612,7 @@ ResourceHandle::ResourceHandle(const ResourceRequest& request, bool defersLoading, bool shouldContentSniff, bool mightDownloadFromHandle) -#pragma warning(suppress: 4355) // it's okay to pass |this| here! +MSVC_SUPPRESS_WARNING(4355) // it's okay to pass |this| here! : d(new ResourceHandleInternal(this, request, client)) { // TODO(darin): figure out what to do with the two bool params } diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index fa607d5..fd3ceb1 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -268,10 +268,10 @@ int WebFrameImpl::live_object_count_ = 0; WebFrameImpl::WebFrameImpl() // Don't complain about using "this" in initializer list. -#pragma warning(disable: 4355) +MSVC_PUSH_DISABLE_WARNING(4355) : frame_loader_client_(this), scope_matches_factory_(this), -#pragma warning(default: 4355) +MSVC_POP_WARNING() currently_loading_request_(NULL), plugin_delegate_(NULL), allows_scrolling_(true), |