# HG changeset patch # User Lars Kurth # Date 1276621439 -3600 # Node ID 16dccf7ef352c7fb20334dd849226ad40f46c102 # Parent ac1910f6e7cb02190e32f995dd329c1c5780cffa Bug 2966 - Fixed template qualifications for GCC diff -r ac1910f6e7cb -r 16dccf7ef352 windowing/windowserver/nga/SERVER/wstypes.h --- a/windowing/windowserver/nga/SERVER/wstypes.h Tue Jun 15 15:39:06 2010 +0100 +++ b/windowing/windowserver/nga/SERVER/wstypes.h Tue Jun 15 18:03:59 2010 +0100 @@ -84,7 +84,7 @@ { public: inline RWsRegionBuf() {} - inline ~RWsRegionBuf() { WS_ASSERT_DEBUG(TRegion::iCount == 0, EWsPanicInvalidRegion); } + inline ~RWsRegionBuf() { WS_ASSERT_DEBUG(RRegionBuf::iCount == 0, EWsPanicInvalidRegion); } inline void Close() { ASSERT(0); } //Do not use, use Reset instead. inline void Clear() { ASSERT(0); } //Do not use, use Reset instead. inline void Reset() @@ -95,11 +95,11 @@ //Clear will set iCount to 0 and, if iAllocedRects>0, free heap memory and set iAllocedRects to 0. RRegionBuf::Clear(); - if(TRegion::iAllocedRects >= 0) + if(RRegionBuf::iAllocedRects >= 0) { //The magic in the next statement reverts this instance back into an RRegionBuf. //(The code is the same as can be found in the initialiser list of RRegionBuf's default constructor.) - TRegion::iAllocedRects = -S&(~TRegion::ERRegionBuf); + RRegionBuf::iAllocedRects = -S&(~TRegion::ERRegionBuf); } } };