#
#
# patch "paths.hh"
#  from [8c2ab4061775ad46a8255d0fc90021c45dd312c0]
#    to [54380109d0bb1555230575a011b1b9ef4dbc5141]
# 
# patch "roster.cc"
#  from [84e18891eff147958ea6547f9d26d7679afa3cc0]
#    to [229568f3e2669041881ff70ed119a89322d75548]
# 
# patch "roster.hh"
#  from [2c54cc36a5c5c34be76013593921b451513a33a8]
#    to [c79aa7425a84c5709c83ce730d823772066f12b2]
# 
# patch "work.cc"
#  from [7427fd015f653a597c9cad80c763f4053424d707]
#    to [644d6a7fef1bbd402c5470f032f824940ea4ab2b]
#
============================================================
--- paths.hh	8c2ab4061775ad46a8255d0fc90021c45dd312c0
+++ paths.hh	54380109d0bb1555230575a011b1b9ef4dbc5141
@@ -102,11 +102,9 @@
 // file_path's can be split into split_path's, and split_path's can be joined
 // into file_path's.
 
-
 #include <iosfwd>
 #include <string>
 #include <vector>
-#include <set>
 
 #include "vocab.hh"
 
@@ -298,8 +296,6 @@ void mark_std_paths_used(void);
 
 void mark_std_paths_used(void);
 
-typedef std::set<split_path> path_set;
-
 // equivalent to file_path_internal(path).split(sp) but more efficient.
 void
 internal_string_to_split_path(std::string const & path, split_path & sp);
============================================================
--- roster.cc	84e18891eff147958ea6547f9d26d7679afa3cc0
+++ roster.cc	229568f3e2669041881ff70ed119a89322d75548
@@ -2421,17 +2421,14 @@ void
 }
 
 void
-roster_t::extract_path_set(path_set & paths) const
+roster_t::extract_path_set(set<file_path> & paths) const
 {
   paths.clear();
   if (has_root())
     {
       for (dfs_iter i(root_dir, true); !i.finished(); ++i)
         {
-          node_t curr = *i;
-          split_path pth;
-          //get_name(curr->self, pth);
-          internal_string_to_split_path(i.path(), pth);
+          file_path pth = file_path_internal(i.path());
           if (!workspace_root(pth))
             paths.insert(pth);
         }
============================================================
--- roster.hh	2c54cc36a5c5c34be76013593921b451513a33a8
+++ roster.hh	c79aa7425a84c5709c83ce730d823772066f12b2
@@ -227,7 +227,7 @@ public:
                 attr_key const & key,
                 attr_value & val) const;
 
-  void extract_path_set(path_set & paths) const;
+  void extract_path_set(std::set<file_path> & paths) const;
 
   node_map const & all_nodes() const
   {
============================================================
--- work.cc	7427fd015f653a597c9cad80c763f4053424d707
+++ work.cc	644d6a7fef1bbd402c5470f032f824940ea4ab2b
@@ -1255,17 +1255,13 @@ workspace::find_unknown_and_ignored(path
                                     set<file_path> & unknown,
                                     set<file_path> & ignored)
 {
-  path_set known_ps;
+  set<file_path> known;
   roster_t new_roster;
   temp_node_id_source nis;
 
   get_current_roster_shape(new_roster, nis);
-  new_roster.extract_path_set(known_ps);
+  new_roster.extract_path_set(known);
 
-  set<file_path> known;
-  for (path_set::const_iterator i = known_ps.begin(); i != known_ps.end(); i++)
-    known.insert(file_path(*i));
-
   file_itemizer u(db, lua, known, unknown, ignored, mask);
   for (vector<file_path>::const_iterator 
          i = roots.begin(); i != roots.end(); ++i)
@@ -1641,7 +1637,7 @@ workspace::perform_content_update(cset c
 {
   roster_t roster;
   temp_node_id_source nis;
-  path_set known_ps;
+  set<file_path> known;
   roster_t new_roster;
   bookkeeping_path detached = path_for_detached_nids();
 
@@ -1651,12 +1647,8 @@ workspace::perform_content_update(cset c
     % detached);
 
   get_current_roster_shape(new_roster, nis);
-  new_roster.extract_path_set(known_ps);
+  new_roster.extract_path_set(known);
 
-  set<file_path> known;
-  for (path_set::const_iterator i = known_ps.begin(); i != known_ps.end(); i++)
-    known.insert(file_path(*i));
-
   workspace_itemizer itemizer(roster, known, nis);
   walk_tree(file_path(), itemizer);