X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=e81ed01b2c38f30a61e55919b431013b6a80bd64;hb=ac103f15a7cead429a7b2ee1f75d67cc988ec81d;hp=a41176b3a6deb02a7135031250ed98fe5ab532b8;hpb=dd9b8de435497ce405d5dd1615dc2dc2d3ab3e63;p=lyx.git

diff --git a/src/vc-backend.C b/src/vc-backend.C
index a41176b3a6..e81ed01b2c 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -31,7 +31,13 @@ using std::ifstream;
 using std::getline;
 using boost::regex;
 using boost::regex_match;
+
+#ifndef USE_INCLUDED_STRING
 using boost::smatch;
+#else
+using boost::cmatch;
+#endif
+
 
 int VCS::doVCCommand(string const & cmd, string const & path)
 {
@@ -252,13 +258,18 @@ void CVS::scanMaster()
 		lyxerr[Debug::LYXVC] << "\t  line: " << line << endl;
 		if (contains(line, tmpf)) {
 			// Ok extract the fields.
+#ifndef USE_INCLUDED_STRING
 			smatch sm;
-			regex_match(line, sm, reg);
+#else
+			cmatch sm;
+#endif
+			regex_match(STRCONV(line), sm, reg);
 
 			//sm[0]; // whole matched string
 			//sm[1]; // filename
-			version_ = sm.str(2);
-			string file_date = sm.str(3);
+			version_ = STRCONV(sm.str(2));
+			string const file_date = STRCONV(sm.str(3));
+
 			//sm[4]; // options
 			//sm[5]; // tag or tagdate
 			FileInfo fi(file_);