merged fusion from the trunk

[SVN r63560]
This commit is contained in:
Christopher Schmidt
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions

View File

@ -17,8 +17,8 @@ namespace
{
struct search_for
{
explicit search_for(int search)
: search(search)
explicit search_for(int in_search)
: search(in_search)
{}
template<typename T>