Bug 844323 - Prelude part 2: Switch xpcom/base/StaticPtr from NULL to nullptr, and add a necessary include. r=khuey

This is necessary to make this header compile in one of the places I use it.  Anyway it's the right change.
This commit is contained in:
Justin Lebar 2013-04-30 13:44:05 -04:00
Родитель 22aa27a292
Коммит d426d1dd09
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -7,6 +7,9 @@
#ifndef mozilla_StaticPtr_h
#define mozilla_StaticPtr_h
#include "mozilla/Assertions.h"
#include "mozilla/NullPtr.h"
namespace mozilla {
/**
@ -209,7 +212,7 @@ REFLEXIVE_EQUALITY_OPERATORS(const StaticAutoPtr<T>&, U*,
// Let us compare StaticAutoPtr to 0.
REFLEXIVE_EQUALITY_OPERATORS(const StaticAutoPtr<T>&, StaticPtr_internal::Zero*,
lhs.get() == NULL, class T)
lhs.get() == nullptr, class T)
// StaticRefPtr (in)equality operators
@ -235,7 +238,7 @@ REFLEXIVE_EQUALITY_OPERATORS(const StaticRefPtr<T>&, U*,
// Let us compare StaticRefPtr to 0.
REFLEXIVE_EQUALITY_OPERATORS(const StaticRefPtr<T>&, StaticPtr_internal::Zero*,
lhs.get() == NULL, class T)
lhs.get() == nullptr, class T)
#undef REFLEXIVE_EQUALITY_OPERATORS