diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
| commit | 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 (patch) | |
| tree | 4b921333653c51253153a70fd9af2d29c04a21e3 /chrome/browser/cancelable_request.h | |
| parent | a263d56dd156e94f3453604d231e06a9bb1f537d (diff) | |
| download | chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.zip chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.gz chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.bz2 | |
Fix NULL vs 0 problems which break the build with -Werror using GCC 4.5
BUG=none
TEST=try to compile with gcc 4.5
Patch by Benjamin Jemlich <pcgod99@gmail.com>.
Review URL: http://codereview.chromium.org/2007003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cancelable_request.h')
| -rw-r--r-- | chrome/browser/cancelable_request.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h index 28bc8ed..32a2120 100644 --- a/chrome/browser/cancelable_request.h +++ b/chrome/browser/cancelable_request.h @@ -192,7 +192,7 @@ class CancelableRequestConsumerBase { }; // Template for clients to use. It allows them to associate random "client -// data" with a specific request. The default value for this type is NULL. +// data" with a specific request. The default value for this type is 0. // The type T should be small and easily copyable (like a pointer // or an integer). template<class T> @@ -280,7 +280,7 @@ class CancelableRequestConsumerTSimple : public CancelableRequestConsumerBase { typedef std::map<PendingRequest, T> PendingRequestList; virtual T get_initial_t() const { - return NULL; + return 0; } virtual void OnRequestAdded(CancelableRequestProvider* provider, |