Reviewers: Yang,
Message:
LGTM.
Description:
Fix GCC 4.7 (C++11) compilation.
Original patch by Olivier Goffart <[email protected]>.
BUG=v8:2136
TEST=
Please review this at http://codereview.chromium.org/10387210/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/profile-generator.cc
src/x64/disasm-x64.cc
Index: src/profile-generator.cc
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index
c03e5261701d0e3f62318b6d7348615da507f2e6..da2a969e7123ea132e550cee99a0df60b7a0f208
100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -3606,9 +3606,9 @@ void HeapSnapshotJSONSerializer::SerializeSnapshot() {
writer_->AddString(",\"meta\":");
// The object describing node serialization layout.
// We use a set of macros to improve readability.
-#define JSON_A(s) "["s"]"
-#define JSON_O(s) "{"s"}"
-#define JSON_S(s) "\""s"\""
+#define JSON_A(s) "[" s "]"
+#define JSON_O(s) "{" s "}"
+#define JSON_S(s) "\"" s "\""
writer_->AddString(JSON_O(
JSON_S("node_fields") ":" JSON_A(
JSON_S("type") ","
Index: src/x64/disasm-x64.cc
diff --git a/src/x64/disasm-x64.cc b/src/x64/disasm-x64.cc
index
7ed81b47e147ac41262deea98f62646ffb0b218b..07381535882e9212519d419ec25e7f3e89c86184
100644
--- a/src/x64/disasm-x64.cc
+++ b/src/x64/disasm-x64.cc
@@ -1684,7 +1684,7 @@ int
DisassemblerX64::InstructionDecode(v8::internal::Vector<char> out_buffer,
default:
UNREACHABLE();
}
- AppendToBuffer("test%c rax,0x%"V8_PTR_PREFIX"x",
+ AppendToBuffer("test%c rax,0x%" V8_PTR_PREFIX "x",
operand_size_code(),
value);
break;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
