Merge remote-tracking branch 'origin/topic/timw/nullptr'

* origin/topic/timw/nullptr:
  The remaining nulls
  plugin/probabilistic/zeekygen: Replace nulls with nullptr
  file_analysis: Replace nulls with nullptr
  analyzer: Replace nulls with nullptr
  iosource/threading/input/logging: Replace nulls with nullptr
This commit is contained in:
Johanna Amann 2020-04-09 08:47:44 -07:00
commit a3a38f0849
187 changed files with 1119 additions and 1117 deletions

View file

@ -310,7 +310,7 @@ public:
// To be overridden by mutable derived class to enable change
// notification.
virtual notifier::Modifiable* Modifiable() { return 0; }
virtual notifier::Modifiable* Modifiable() { return nullptr; }
#ifdef DEBUG
// For debugging, we keep a reference to the global ID to which a
@ -804,7 +804,7 @@ public:
void ClearTimer(Timer* t)
{
if ( timer == t )
timer = 0;
timer = nullptr;
}
HashKey* ComputeHash(const Val* index) const;
@ -843,7 +843,7 @@ protected:
IntrusivePtr<Val> Default(Val* index);
// Returns true if item expiration is enabled.
bool ExpirationEnabled() { return expire_time != 0; }
bool ExpirationEnabled() { return expire_time != nullptr; }
// Returns the expiration time defined by %{create,read,write}_expire
// attribute, or -1 for unset/invalid values. In the invalid case, an