Show
Ignore:
Timestamp:
11/20/07 23:45:14 (1 year ago)
Author:
daboo
Message:

Merge of win32-merge branch.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • Mulberry/trunk/Sources_Common/Application/Preferences/CMatchItem.cp

    r19 r143  
    6868{ 
    6969        // Count number of true items in selected range 
    70         return ::count(mBitsSet.begin() + eSelected_First, mBitsSet.begin() + eSelected_Last + 1, true); 
     70        bool val = true; 
     71        return ::count(mBitsSet.begin() + eSelected_First, mBitsSet.begin() + eSelected_Last + 1, val); 
    7172} 
    7273 
     
    7475{ 
    7576        // If nothing selected return 
    76         size_t bitsset = ::count(mBitsSet.begin(), mBitsSet.end(), true); 
     77        bool val = true; 
     78        size_t bitsset = ::count(mBitsSet.begin(), mBitsSet.end(), val); 
    7779        bitsset += mSearchSet.size(); 
    7880        if (!bitsset)