[patch] Fix of previous patch

no_auto_ptr.patch (text/plain), 1.46 KB, created by Martin Väth on 2011-02-21 23:30:27 UTC

--- src/search/packagetest.cc
+++ src/search/packagetest.cc
@@ -285,15 +285,15 @@
 	{ \
 		vector<string> pairs; \
 		split_string(pairs, s, true); \
-		for(vector<string>::iterator it(pairs.begin()); \
+		for(vector<string>::const_iterator it(pairs.begin()); \
 			likely(it != pairs.end()); ++it) { \
-			string *s_ptr(&(*it)); \
+			vector<string>::const_iterator sit(it); \
 			++it; \
 			if(it == pairs.end()) { \
-				default_value = f(*s_ptr); \
+				default_value = f(*sit); \
 				return; \
 			} \
-			m.push_back(new Regex(s_ptr->c_str())); \
+			m.push_back(new Regex(sit->c_str())); \
 			v.push_back(f(*it)); \
 		} \
 		default_value = d; \
@@ -324,10 +324,10 @@
 PackageTest::MatchField
 PackageTest::get_matchfield(const char *p) throw(ExBasic)
 {
-	static auto_ptr<MatcherField> m;
-	if(!m.get()) {
+	static MatcherField *m(NULL);
+	if(m == NULL) {
 		EixRc &rc(get_eixrc(NULL));
-		m = auto_ptr<MatcherField>(new MatcherField(rc["DEFAULT_MATCH_FIELD"]));
+		m = new MatcherField(rc["DEFAULT_MATCH_FIELD"]);
 	}
 	return m->parse(p);
 }
@@ -335,10 +335,10 @@
 PackageTest::MatchAlgorithm
 PackageTest::get_matchalgorithm(const char *p) throw(ExBasic)
 {
-	static auto_ptr<MatcherAlgorithm> m;
-	if(!m.get()) {
+	static MatcherAlgorithm *m(NULL);
+	if(m == NULL) {
 		EixRc &rc(get_eixrc(NULL));
-		m = auto_ptr<MatcherAlgorithm>(new MatcherAlgorithm(rc["DEFAULT_MATCH_ALGORITHM"]));
+		m = new MatcherAlgorithm(rc["DEFAULT_MATCH_ALGORITHM"]);
 	}
 	return m->parse(p);
 }