[Monotone-devel] [PATCH] fix compilation errors with gcc 4.1

[Roland McGrath]

I found this patch necessary to make monotone 0.24 build with gcc 4.1,
which has again tightened the constraints on C++ syntax.


Thanks,
Roland


2005-12-17  Roland McGrath  <address@hidden>

        * work.hh (struct file_itemizer): Remove extraneous qualifier on
        visit_file declaration.
        * app_state.hh (class app_state): Remove extraneous qualifier on
        set_restriction declaration.

--- monotone-0.24/app_state.hh
+++ monotone-0.24/app_state.hh
@@ -88,9 +88,9 @@ public:
   void require_working_copy(std::string const & explanation = "");
   void create_working_copy(system_path const & dir);
 
-  void app_state::set_restriction(path_set const & valid_paths, 
-                             std::vector<utf8> const & paths,
-                             bool respect_ignore = true);
+  void set_restriction(path_set const & valid_paths,
+                      std::vector<utf8> const & paths,
+                      bool respect_ignore = true);
   bool restriction_includes(file_path const & path);
 
   // Set the branch name.  If you only invoke set_branch, the branch
--- monotone-0.24/work.hh
+++ monotone-0.24/work.hh
@@ -56,7 +56,7 @@ struct file_itemizer : public tree_walke
   path_set & ignored;
   file_itemizer(app_state & a, path_set & k, path_set & u, path_set & i) 
     : app(a), known(k), unknown(u), ignored(i) {}
-  virtual void file_itemizer::visit_file(file_path const & path);
+  virtual void visit_file(file_path const & path);
 };
 
 void