Reviewers: Michael Starzinger,

Description:
Merged r13348 into trunk branch.

Fix objectprint=on build.

[email protected]
BUG=


Please review this at https://codereview.chromium.org/11818031/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M src/objects-printer.cc
  M src/version.cc


Index: src/objects-printer.cc
diff --git a/src/objects-printer.cc b/src/objects-printer.cc
index c88de2193c8bc8bb3ed38863a831ce7023cf446a..ce23298ed34fa062e969c8519b7fa6bbe3aec6f4 100644
--- a/src/objects-printer.cc
+++ b/src/objects-printer.cc
@@ -703,7 +703,7 @@ char* String::ToAsciiArray() {
   static char* buffer = NULL;
   if (buffer != NULL) free(buffer);
   buffer = new char[length()+1];
-  WriteToFlat(this, buffer, 0, length());
+  WriteToFlat(this, reinterpret_cast<uint8_t*>(buffer), 0, length());
   buffer[length()] = 0;
   return buffer;
 }
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 25854d241511122acd2e44e62c109349e3af284a..8f4f5364d0bfd36c6df737a4fe957859c5a2bea0 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     16
 #define BUILD_NUMBER      3
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to