unsigned int changed to match_flag_type in several places, plus occurance of std rather than boost. [SVN r22160]
[SVN r20470]
[SVN r18430]