citation patch from Angus

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

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 46fc8b1e2a509b8490c7a33b46b8459d36305746..3b4ef26a23132ff2248c66059c5156f3567e7f04 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -18,6 +18,7 @@
 
 using std::endl;
 using std::ifstream;
+using std::getline;
 
 int VCS::doVCCommand(string const & cmd, string const & path)
 {
@@ -105,7 +106,7 @@ void RCS::scanMaster()
                        // get locker here
                        if (contains(token, ";")) {
                                locker_ = "Unlocked";
-                               vcstat = UNLOCKED;
+                               vcstatus = UNLOCKED;
                                continue;
                        }
                        string tmpt, s1, s2;
@@ -117,7 +118,7 @@ void RCS::scanMaster()
                                // s2 is user, and s1 is version
                                if (s1 == version_) {
                                        locker_ = s2;
-                                       vcstat = LOCKED;
+                                       vcstatus = LOCKED;
                                        break;
                                }
                        } while (!contains(tmpt, ";"));
@@ -257,12 +258,12 @@ void CVS::scanMaster()
                                << mod_date << "'" << endl;
                        if (file_date == mod_date) {
                                locker_ = "Unlocked";
-                               vcstat = UNLOCKED;
+                               vcstatus = UNLOCKED;
                        } else {
                                // Here we should also to some more checking
                                // to see if there are conflicts or not.
                                locker_ = "Locked";
-                               vcstat = LOCKED;
+                               vcstatus = LOCKED;
                        }
                        break;
                }