Builds on Windows too.
authorlrn@chromium.org <lrn@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Tue, 2 Dec 2008 10:19:10 +0000 (10:19 +0000)
committerlrn@chromium.org <lrn@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Tue, 2 Dec 2008 10:19:10 +0000 (10:19 +0000)
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@894 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/runtime.cc

index 5512f83..749bee0 100644 (file)
@@ -1383,13 +1383,14 @@ int Runtime::StringMatch(Handle<String> sub,
       }
       Vector<const char> ascii_vector =
         sub->ToAsciiVector().SubVector(start_index, subject_length);
-      void* pos = memchr(ascii_vector.start(),
-                         static_cast<const char>(pchar),
-                         static_cast<size_t>(ascii_vector.length()));
+      const void* pos = memchr(ascii_vector.start(),
+                               static_cast<const char>(pchar),
+                               static_cast<size_t>(ascii_vector.length()));
       if (pos == NULL) {
         return -1;
       }
-      return reinterpret_cast<char*>(pos) - ascii_vector.start() + start_index;
+      return reinterpret_cast<const char*>(pos) - ascii_vector.start()
+          + start_index;
     }
     return SingleCharIndexOf(sub->ToUC16Vector(),
                              pat->Get(pat_shape, 0),