diff options
| author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 12:21:23 +0000 |
|---|---|---|
| committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 12:21:23 +0000 |
| commit | 45d69a2e92ebc98008c06ea1b6256835c236ea39 (patch) | |
| tree | d913809a6c84235245b418c11babd3a68bd7f6d9 /base | |
| parent | 10c123c1755e21c4503a2a7bd1ac9eeb89776311 (diff) | |
| download | chromium_src-45d69a2e92ebc98008c06ea1b6256835c236ea39.zip chromium_src-45d69a2e92ebc98008c06ea1b6256835c236ea39.tar.gz chromium_src-45d69a2e92ebc98008c06ea1b6256835c236ea39.tar.bz2 | |
Use 0 instead of NULL, since AtomicWord is intptr_t which is not a pointer type. GCC warns when converting NULL to a non-pointer type.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/singleton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/singleton.h b/base/singleton.h index 3730c80..d57841b 100644 --- a/base/singleton.h +++ b/base/singleton.h @@ -196,7 +196,7 @@ class Singleton { template <typename Type, typename Traits, typename DifferentiatingType> base::subtle::AtomicWord Singleton<Type, Traits, DifferentiatingType>:: - instance_ = NULL; + instance_ = 0; #endif // BASE_SINGLETON_H__ |