Reviewers: Jakob,

Description:
Merged r16994 into trunk branch.

Try to make MSVC happy about EscapableHandleScope.

[email protected]

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

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

Affected files (+8, -1 lines):
  M include/v8.h
  M src/version.cc


Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index 70e64a2285f474573009210382dc80eb51402391..19abf0fb543a1b2c12c52b6d0aebba75cd2a8fa1 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -859,6 +859,13 @@ class V8_EXPORT EscapableHandleScope : public HandleScope {
  private:
   internal::Object** Escape(internal::Object** escape_value);

+  // Make it hard to create heap-allocated or illegal handle scopes by
+  // disallowing certain operations.
+  EscapableHandleScope(const EscapableHandleScope&);
+  void operator=(const EscapableHandleScope&);
+  void* operator new(size_t size);
+  void operator delete(void*, size_t);
+
   internal::Object** escape_slot_;
 };

Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 3be963e36dee6e99cdbc7307e50e3c64a34ae020..e310df0527c967a76660bdefe3a904bd26d70d3c 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     22
 #define BUILD_NUMBER      3
-#define PATCH_LEVEL       1
+#define PATCH_LEVEL       2
 // 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
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to