diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
| commit | 5a3b9149085f033097663a63c90e152051fd6c56 (patch) | |
| tree | 4e0ed4ceabd2ce7b7fd7ed2c9168f7641c5ad8f3 /chrome/browser/cancelable_request.h | |
| parent | c5874079454b61b597de2258c4256d5008183b1a (diff) | |
| download | chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.zip chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.gz chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.bz2 | |
Revert "Fix a ton of compiler warnings."
This reverts commit r24792.
TBR=estade
Review URL: http://codereview.chromium.org/179028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cancelable_request.h')
| -rw-r--r-- | chrome/browser/cancelable_request.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h index 3840936..713440e 100644 --- a/chrome/browser/cancelable_request.h +++ b/chrome/browser/cancelable_request.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -80,8 +80,8 @@ // } // }; -#ifndef CHROME_BROWSER_CANCELABLE_REQUEST_H_ -#define CHROME_BROWSER_CANCELABLE_REQUEST_H_ +#ifndef CHROME_BROWSER_CANCELABLE_REQUEST_H__ +#define CHROME_BROWSER_CANCELABLE_REQUEST_H__ #include <map> #include <vector> @@ -274,7 +274,7 @@ class CancelableRequestConsumerTSimple : public CancelableRequestConsumerBase { typedef std::map<PendingRequest, T> PendingRequestList; virtual T get_initial_t() const { - return 0; + return NULL; } virtual void OnRequestAdded(CancelableRequestProvider* provider, @@ -543,4 +543,4 @@ class CancelableRequest1 : public CancelableRequest<CB> { Type value; }; -#endif // CHROME_BROWSER_CANCELABLE_REQUEST_H_ +#endif // CHROME_BROWSER_CANCELABLE_REQUEST_H__ |