diff --git a/core/meta/src/TClass.cxx b/core/meta/src/TClass.cxx index fa7d04444bb416f91dbe46f9bc5a9a67773e67d0..c7e68730009a15cc8e04b28a1c355dbfac8ecf76 100644 --- a/core/meta/src/TClass.cxx +++ b/core/meta/src/TClass.cxx @@ -3705,7 +3705,7 @@ TVirtualStreamerInfo* TClass::GetStreamerInfoAbstractEmulated(Int_t version /* = } //______________________________________________________________________________ -void TClass::IgnoreTObjectStreamer(Bool_t ignore) +void TClass::IgnoreTObjectStreamer(Bool_t doIgnore) { // When the class kIgnoreTObjectStreamer bit is set, the automatically // generated Streamer will not call TObject::Streamer. @@ -3721,8 +3721,8 @@ void TClass::IgnoreTObjectStreamer(Bool_t ignore) // To be effective for object streamed member-wise or split in a TTree, // this function must be called for the most derived class (i.e. BigTrack). - if ( ignore && TestBit(kIgnoreTObjectStreamer)) return; - if (!ignore && !TestBit(kIgnoreTObjectStreamer)) return; + if ( doIgnore && TestBit(kIgnoreTObjectStreamer)) return; + if (!doIgnore && !TestBit(kIgnoreTObjectStreamer)) return; TVirtualStreamerInfo *sinfo = GetCurrentStreamerInfo(); if (sinfo) { if (sinfo->IsCompiled()) { @@ -3739,8 +3739,8 @@ void TClass::IgnoreTObjectStreamer(Bool_t ignore) return; } } - if (ignore) SetBit (kIgnoreTObjectStreamer); - else ResetBit(kIgnoreTObjectStreamer); + if (doIgnore) SetBit (kIgnoreTObjectStreamer); + else ResetBit(kIgnoreTObjectStreamer); } //______________________________________________________________________________ diff --git a/html/inc/THtml.h b/html/inc/THtml.h index 1597ec26bd91909b2fda19699cf698f9197ea2a2..01ec07cdf63f36b9595c6db89f889ded025259ec 100644 --- a/html/inc/THtml.h +++ b/html/inc/THtml.h @@ -172,8 +172,8 @@ public: // Utility class representing a directory class TFileSysDB: public TFileSysDir { public: - TFileSysDB(const char* path, const char* ignore, Int_t maxdirlevel): - TFileSysDir(path, 0), fEntries(1009, 5), fIgnorePath(ignore), fMaxLevel(maxdirlevel) + TFileSysDB(const char* path, const char* ignorePath, Int_t maxdirlevel): + TFileSysDir(path, 0), fEntries(1009, 5), fIgnorePath(ignorePath), fMaxLevel(maxdirlevel) { Fill(); } TExMap& GetMapIno() { return fMapIno; }