Merge remote-tracking branch 'origin/master' into topic/johanna/clone

This commit is contained in:
Johanna Amann 2019-05-20 15:18:10 -07:00
commit d13c939233
1389 changed files with 5408 additions and 12577 deletions

View file

@ -535,9 +535,6 @@ public:
// values. (In any case, don't forget to call the parent's method.)
typedef char Properties;
static const int PERSISTENT = 0x01;
static const int SYNCHRONIZED = 0x02;
// Tracked by NotifierRegistry, not recursive.
static const int TRACKED = 0x04;
@ -551,10 +548,10 @@ public:
bool LoggingAccess() const
{
#ifndef DEBUG
return props & (SYNCHRONIZED|PERSISTENT|TRACKED);
return props & TRACKED;
#else
return debug_logger.IsVerbose() ||
(props & (SYNCHRONIZED|PERSISTENT|TRACKED));
(props & TRACKED);
#endif
}