From 20f79e400fe959ba6fbdc8c3069e26d1a66ba88d Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 1 Sep 2012 17:27:49 +0200 Subject: [PATCH] fixed incorrect unique() algo usage --- src/common/rclconfig.cpp | 6 ++++-- src/utils/conftree.h | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp index 05892aa0..b303fce9 100644 --- a/src/common/rclconfig.cpp +++ b/src/common/rclconfig.cpp @@ -956,7 +956,8 @@ vector RclConfig::getSkippedPaths() *it = path_canon(*it); } sort(skpl.begin(), skpl.end()); - unique(skpl.begin(), skpl.end()); + vector::iterator uit = unique(skpl.begin(), skpl.end()); + skpl.resize(uit - skpl.begin()); return skpl; } @@ -978,7 +979,8 @@ vector RclConfig::getDaemSkippedPaths() sort(dskpl.begin(), dskpl.end()); merge(dskpl.begin(), dskpl.end(), skpl1.begin(), skpl1.end(), skpl.begin()); - unique(skpl.begin(), skpl.end()); + vector::iterator uit = unique(skpl.begin(), skpl.end()); + skpl.resize(uit - skpl.begin()); } return skpl; } diff --git a/src/utils/conftree.h b/src/utils/conftree.h index 337dc9e4..42533d5c 100644 --- a/src/utils/conftree.h +++ b/src/utils/conftree.h @@ -471,7 +471,8 @@ public: break; } sort(nms.begin(), nms.end()); - unique(nms.begin(), nms.end()); + vector::iterator uit = unique(nms.begin(), nms.end()); + nms.resize(uit - nms.begin()); return nms; } @@ -488,7 +489,8 @@ public: break; } sort(sks.begin(), sks.end()); - unique(sks.begin(), sks.end()); + vector::iterator uit = unique(sks.begin(), sks.end()); + sks.resize(uit - sks.begin()); return sks; }