Merged bleeding_edge -r 685:746 into regexp2000.

src/log.cc

Index: src/log.cc
===================================================================
--- src/log.cc	(revision 746)
+++ src/log.cc	(working copy)
@@ -431,8 +431,7 @@
   LogRegExpSource(regexp);
   fprintf(logfile_, ",");
   LogString(input_string);
-  StringShape shape(*input_string);
-  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length(shape));
+  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length());
 #endif
 }
 
@@ -729,7 +728,7 @@
           stream.Put(*p);
         }
       }
-      SmartPointer<char> expanded = stream.ToCString();
+      SmartPointer<const char> expanded = stream.ToCString();
       logfile_ = OS::FOpen(*expanded, "w");
     } else {
       logfile_ = OS::FOpen(FLAG_logfile, "w");