From ab68dc3af92483f646422cdcd77f0479263c78dc Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 6 Aug 2011 14:36:43 -0700 Subject: [PATCH] Some compilers think "not" is a reserved word. --- Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp | 16 ++++++++-------- Sources/Plasma/PubUtilLib/plScene/plVisMgr.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp index ce96e65d..29cc464d 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.cpp @@ -60,13 +60,13 @@ void plVisMgr::Write(hsStream* s, hsResMgr* mgr) hsKeyedObject::Write(s, mgr); } -void plVisMgr::Register(plVisRegion* reg, hsBool not) +void plVisMgr::Register(plVisRegion* reg, hsBool bnot) { // This should happen pretty infrequently, or // I wouldn't be doing it so cloth-headed-ly. - hsTArray& regions = not ? fNotRegions : fRegions; - hsBitVector& indices = not ? fIdxNot : fIdxSet; - int& maxIdx = not ? fMaxNot : fMaxSet; + hsTArray& regions = bnot ? fNotRegions : fRegions; + hsBitVector& indices = bnot ? fIdxNot : fIdxSet; + int& maxIdx = bnot ? fMaxNot : fMaxSet; int i; for( i = kNumReserved; ; i++ ) { @@ -84,14 +84,14 @@ void plVisMgr::Register(plVisRegion* reg, hsBool not) hsAssert(false, "Infinite bitvector has all bits set?"); } -void plVisMgr::UnRegister(plVisRegion* reg, hsBool not) +void plVisMgr::UnRegister(plVisRegion* reg, hsBool bnot) { // Mark our index for recycling - hsBitVector& indices= not ? fIdxNot : fIdxSet; + hsBitVector& indices= bnot ? fIdxNot : fIdxSet; indices.ClearBit(reg->GetIndex()); // Nuke the region from our list. - hsTArray& regions = not ? fNotRegions : fRegions; + hsTArray& regions = bnot ? fNotRegions : fRegions; int idx = regions.Find(reg); if( regions.kMissingIndex != idx ) regions.Remove(idx); @@ -204,4 +204,4 @@ void plGlobalVisMgr::DeInit() fInstance->UnRegisterAs(kGlobalVisMgr_KEY); fInstance = nil; } -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h index d18c8eca..5e3fe77b 100644 --- a/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h +++ b/Sources/Plasma/PubUtilLib/plScene/plVisMgr.h @@ -82,8 +82,8 @@ public: virtual void Read(hsStream* stream, hsResMgr* mgr); virtual void Write(hsStream* stream, hsResMgr* mgr); - void Register(plVisRegion* reg, hsBool not); - void UnRegister(plVisRegion* reg, hsBool not); + void Register(plVisRegion* reg, hsBool bnot); + void UnRegister(plVisRegion* reg, hsBool bnot); void Eval(const hsPoint3& pos);