# 
# patch "ChangeLog"
#  from [127927f012cc17187bbf3a654a9cfe9b158507e7]
#    to [8a816d743b0255ec73fb9430dfe379194dc235a6]
# 
# patch "file_io.cc"
#  from [a2bdedd6068a90ec8ebf19add5145c995e878bce]
#    to [708668746d8b1207f9a977f57c3add7609d8f5c5]
# 
# patch "file_io.hh"
#  from [ccb9ff07ec95081cea4cab9278e6b5ec219dd86c]
#    to [e64e0d786937f6cc2a4c1fff6f16bc1285bec0b0]
# 
# patch "unit_tests.cc"
#  from [88c26630e9d9d3235cd551da4d30905745300cf0]
#    to [4fb42f5d274195a4c766d3f945dbacacef0bb183]
# 
# patch "unit_tests.hh"
#  from [4bce57e49e422091790f80c5ae70b27b239c3c55]
#    to [b4771072e78a9d5490ec02109d82506ea454b54a]
# 
# patch "unix/fs.cc"
#  from [b07c7213446f62380f15f0b8985beb716cecd8f3]
#    to [f662e2ce8ffda78997c89c83c583add594d99462]
# 
========================================================================
--- ChangeLog	127927f012cc17187bbf3a654a9cfe9b158507e7
+++ ChangeLog	8a816d743b0255ec73fb9430dfe379194dc235a6
@@ -1,5 +1,11 @@
 2005-08-25  Nathaniel Smith  <address@hidden>
 
+	* unit_tests.{cc,hh} (init_unit_test_suite): Remove
+	path_component_tests.
+	* unix/fs.cc (tilde_expand): Another compile fix.
+
+2005-08-25  Nathaniel Smith  <address@hidden>
+
 	* {unix,win32}/fs.cc: Misc. compile fixes.
 
 2005-08-25  Nathaniel Smith  <address@hidden>
========================================================================
--- file_io.cc	a2bdedd6068a90ec8ebf19add5145c995e878bce
+++ file_io.cc	708668746d8b1207f9a977f57c3add7609d8f5c5
@@ -187,8 +187,8 @@
 }
 
 void 
-move_dir(file_path const & old_path,
-         file_path const & new_path) 
+move_dir(any_path const & old_path,
+         any_path const & new_path) 
 { 
   require_path_is_directory(old_path,
                             F("rename source dir '%s' does not exist") % old_path,
========================================================================
--- file_io.hh	ccb9ff07ec95081cea4cab9278e6b5ec219dd86c
+++ file_io.hh	e64e0d786937f6cc2a4c1fff6f16bc1285bec0b0
@@ -70,8 +70,7 @@
 // app_state.cc assumes that this is implemented by boost::fs
 void mkdir_p(any_path const & path);
 
-void make_dir_for(file_path const & p);
-void make_dir_for(bookkeeping_path const & p);
+void make_dir_for(any_path const & p);
 
 void delete_file(any_path const & path);
 void delete_dir_recursive(any_path const & path);
========================================================================
--- unit_tests.cc	88c26630e9d9d3235cd551da4d30905745300cf0
+++ unit_tests.cc	4fb42f5d274195a4c766d3f945dbacacef0bb183
@@ -74,9 +74,6 @@
   if (t.empty() || t.find("netcmd") != t.end())
     add_netcmd_tests(suite);  
 
-  if (t.empty() || t.find("path_component") != t.end())
-    add_path_component_tests(suite);  
-
   if (t.empty() || t.find("globish") != t.end())
     add_globish_tests(suite);  
   
========================================================================
--- unit_tests.hh	4bce57e49e422091790f80c5ae70b27b239c3c55
+++ unit_tests.hh	b4771072e78a9d5490ec02109d82506ea454b54a
@@ -31,7 +31,6 @@
 void add_xdelta_tests(test_suite * suite);
 void add_packet_tests(test_suite * suite);
 void add_netcmd_tests(test_suite * suite);
-void add_path_component_tests(test_suite * suite);
 void add_globish_tests(test_suite * suite);
 void add_crypto_tests(test_suite * suite);
 void add_string_queue_tests(test_suite * suite);
========================================================================
--- unix/fs.cc	b07c7213446f62380f15f0b8985beb716cecd8f3
+++ unix/fs.cc	f662e2ce8ffda78997c89c83c583add594d99462
@@ -67,7 +67,7 @@
           pw = getpwnam(i->substr(1).c_str());
           N(pw != NULL,
             F("could not find home directory for user %s") % i->substr(1));
-          res /= string(pw->pw_dir);
+          res /= std::string(pw->pw_dir);
           ++i;
         }
       while (i != tmp.end())