# 
# patch "ChangeLog"
#  from [2ae73db315f0d53795fab150a0253f2f6ab6c054]
#    to [34577ec1b177cb0bf816d1b316ae65e1aa5680ab]
# 
# patch "commands.cc"
#  from [70217e8242dc974f52e6d61ccc120d588826b96c]
#    to [4ebc397acf584d56851c22da3e9c043c37f01b8b]
# 
# patch "sanity.cc"
#  from [25de789c94abcda2a2e65b3126a4b53757ee9a5f]
#    to [228ea3451671f274c12d8639e156f66e6a197bb1]
# 
# patch "transforms.cc"
#  from [5f391379f3632cc61aa99aaf61a9721c0e0a34ed]
#    to [d50dc1ea1d44b509d2c32f56c07a8e869d5204a1]
# 
========================================================================
--- ChangeLog	2ae73db315f0d53795fab150a0253f2f6ab6c054
+++ ChangeLog	34577ec1b177cb0bf816d1b316ae65e1aa5680ab
@@ -1,4 +1,9 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
+	
+	* More compile fixes.  All remaing compile errors are real
+	problems, yay.
+	
+2005-08-24  Nathaniel Smith  <address@hidden>
 
 	* Lots and lots more compile fixes.
 
========================================================================
--- commands.cc	70217e8242dc974f52e6d61ccc120d588826b96c
+++ commands.cc	4ebc397acf584d56851c22da3e9c043c37f01b8b
@@ -283,7 +283,7 @@
     if (path.empty())
       return;
     N(!path_state(path), F("pid file '%s' already exists") % path);
-    file.open(path.as_external());
+    file.open(path.as_external().c_str());
     file << get_process_id();
     file.flush();
   }
@@ -293,7 +293,7 @@
     if (path.empty())
       return;
     pid_t pid;
-    std::ifstream(path.as_external()) >> pid;
+    std::ifstream(path.as_external().c_str()) >> pid;
     if (pid == get_process_id()) {
       file.close();
       delete_file(path);
========================================================================
--- sanity.cc	25de789c94abcda2a2e65b3126a4b53757ee9a5f
+++ sanity.cc	228ea3451671f274c12d8639e156f66e6a197bb1
@@ -45,7 +45,7 @@
 {
   if (!filename.empty())
     {
-      ofstream out(filename.as_external());
+      ofstream out(filename.as_external().c_str());
       if (out)
         {
           copy(logbuf.begin(), logbuf.end(), ostream_iterator<char>(out));
========================================================================
--- transforms.cc	5f391379f3632cc61aa99aaf61a9721c0e0a34ed
+++ transforms.cc	d50dc1ea1d44b509d2c32f56c07a8e869d5204a1
@@ -260,7 +260,7 @@
        i != m.end(); ++i)
     {
       sz += i->second.inner()().size();
-      sz += i->first.as_internal().size();
+      sz += i->first.as_internal()().size();
       sz += 3;      
     }