tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed incorrect unique() algo usage

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-09-01 17:27:49 +02:00
parent de812094b5
commit 20f79e400f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/rclconfig.cpp
View File

@ -956,7 +956,8 @@ vector<string> RclConfig::getSkippedPaths()
*it = path_canon(*it); *it = path_canon(*it);
} }
sort(skpl.begin(), skpl.end()); sort(skpl.begin(), skpl.end());
unique(skpl.begin(), skpl.end()); vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
skpl.resize(uit - skpl.begin());
return skpl; return skpl;
} }
@ -978,7 +979,8 @@ vector<string> RclConfig::getDaemSkippedPaths()
sort(dskpl.begin(), dskpl.end()); sort(dskpl.begin(), dskpl.end());
merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(),
skpl.begin()); skpl.begin());
unique(skpl.begin(), skpl.end()); vector<string>::iterator uit = unique(skpl.begin(), skpl.end());
skpl.resize(uit - skpl.begin());
} }
return skpl; return skpl;
} }

6
src/utils/conftree.h
View File

@ -471,7 +471,8 @@ public:
break; break;
} }
sort(nms.begin(), nms.end()); sort(nms.begin(), nms.end());
unique(nms.begin(), nms.end()); vector<string>::iterator uit = unique(nms.begin(), nms.end());
nms.resize(uit - nms.begin());
return nms; return nms;
} }
@ -488,7 +489,8 @@ public:
break; break;
} }
sort(sks.begin(), sks.end()); sort(sks.begin(), sks.end());
unique(sks.begin(), sks.end()); vector<string>::iterator uit = unique(sks.begin(), sks.end());
sks.resize(uit - sks.begin());
return sks; return sks;
} }