--- src/frontends/controllers/biblio.C.orig	2005-03-21 14:31:22.000000000 +0000
+++ src/frontends/controllers/biblio.C	2006-07-11 12:02:27.000000000 +0000
@@ -376,13 +376,14 @@
 	// Note that '[' and '\' must be escaped.
 	// This is a limitation of boost::regex, but all other chars in BREs
 	// are assumed literal.
-	boost::RegEx reg("[].|*?+(){}^$\\[\\\\]");
+	boost::regex reg("[].|*?+(){}^$\\[\\\\]");
 
 	// $& is a perl-like expression that expands to all of the current match
 	// The '$' must be prefixed with the escape character '\' for
 	// boost to treat it as a literal.
 	// Thus, to prefix a matched expression with '\', we use:
-	return reg.Merge(expr, "\\\\$&");
+	regex_replace(expr, reg, "\\\\$&");
+	return expr;
 }
 
 
@@ -409,14 +410,14 @@
 
 		// Attempts to find a match for the current RE
 		// somewhere in data.
-		return regex_.Search(data);
+ 		return regex_search(data, regex_);
 	}
 
 	bool validRE() const { return regex_.error_code() == 0; }
 
 private:
 	InfoMap const map_;
-	mutable boost::RegEx regex_;
+	mutable boost::regex regex_;
 };
 
 } // namespace anon
--- src/support/filetools.C	2006/07/11 09:33:19	1.1
+++ src/support/filetools.C	2006/07/11 10:35:39
@@ -610,8 +610,8 @@
 		RTemp = "./" + path;
 
 	// Normalise paths like /foo//bar ==> /foo/bar
-	boost::RegEx regex("/{2,}");
-	RTemp = regex.Merge(RTemp, "/");
+	boost::regex e("/{2,}");
+	regex_replace(RTemp, e, "/");
 
 	while (!RTemp.empty()) {
 		// Split by next /