From 2b1e4560e73aabac2695e0c93671fe2d661e223b Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Thu, 2 Sep 2010 10:18:44 +0000 Subject: [PATCH] Clang compatibility changes. This is a commit of http://codereview.chromium.org/3364002 for coldredlemur git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5402 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ast.h | 2 +- src/code-stubs.h | 4 ++-- src/flag-definitions.h | 2 +- src/platform.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ast.h b/src/ast.h index 5071b2c..9fcf256 100644 --- a/src/ast.h +++ b/src/ast.h @@ -1747,7 +1747,7 @@ class RegExpText: public RegExpTree { void AddElement(TextElement elm) { elements_.Add(elm); length_ += elm.length(); - }; + } ZoneList* elements() { return &elements_; } private: ZoneList elements_; diff --git a/src/code-stubs.h b/src/code-stubs.h index c2dd0a7..98a5cf6 100644 --- a/src/code-stubs.h +++ b/src/code-stubs.h @@ -110,10 +110,10 @@ class CodeStub BASE_EMBEDDED { static Major MajorKeyFromKey(uint32_t key) { return static_cast(MajorKeyBits::decode(key)); - }; + } static int MinorKeyFromKey(uint32_t key) { return MinorKeyBits::decode(key); - }; + } // Gets the major key from a code object that is a code stub or binary op IC. static Major GetMajorKey(Code* code_stub) { diff --git a/src/flag-definitions.h b/src/flag-definitions.h index a143bcd..a63088d 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -283,7 +283,7 @@ DEFINE_bool(remote_debugger, false, "Connect JavaScript debugger to the " "debugger agent in another process") DEFINE_bool(debugger_agent, false, "Enable debugger agent") DEFINE_int(debugger_port, 5858, "Port to use for remote debugging") -DEFINE_string(map_counters, false, "Map counters to a file") +DEFINE_string(map_counters, NULL, "Map counters to a file") DEFINE_args(js_arguments, JSArguments(), "Pass all remaining arguments to the script. Alias for \"--\".") diff --git a/src/platform.h b/src/platform.h index e0dd66e..e9e7c22 100644 --- a/src/platform.h +++ b/src/platform.h @@ -302,7 +302,7 @@ class VirtualMemory { void* address() { ASSERT(IsReserved()); return address_; - }; + } // Returns the size of the reserved memory. size_t size() { return size_; } -- 2.7.4