more cursor dispatch

[lyx.git] / src / vc-backend.C

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 46b8b6d55764461cce54c02d31e7c70948e1408e..99bcd4fa4646d305ec61b6b17b9f88a2bb1b1421 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -46,7 +46,7 @@ using std::gmtime;
 
 using std::endl;
 using std::getline;
-
+using std::string;
 using std::ifstream;
 
 
@@ -134,7 +134,7 @@ void RCS::scanMaster()
                        // nothing
                } else if (contains(token, "locks")) {
                        // get locker here
-                       if (contains(token, ";")) {
+                       if (contains(token, ';')) {
                                locker_ = "Unlocked";
                                vcstatus = UNLOCKED;
                                continue;
@@ -153,7 +153,7 @@ void RCS::scanMaster()
                                        vcstatus = LOCKED;
                                        break;
                                }
-                       } while (!contains(tmpt, ";"));
+                       } while (!contains(tmpt, ';'));
 
                } else if (token == "comment") {
                        // we don't need to read any further than this.
@@ -264,7 +264,7 @@ void CVS::scanMaster()
        string tmpf = "/" + OnlyFilename(file_) + "/";
        lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
        string line;
-       regex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
+       static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
        while (getline(ifs, line)) {
                lyxerr[Debug::LYXVC] << "\t  line: " << line << endl;
                if (contains(line, tmpf)) {