From 9d71e74491081f2682224ce0b92079faf2f97782 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 Dec 2011 21:12:48 +0100
Subject: [PATCH] isolates: rename node::Isolate member isolate_ to v8_isolate_

---
 src/node_isolate.cc | 12 ++++++------
 src/node_isolate.h  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/node_isolate.cc b/src/node_isolate.cc
index 50d6ded..b6156fd 100644
--- a/src/node_isolate.cc
+++ b/src/node_isolate.cc
@@ -38,14 +38,14 @@ Isolate::Isolate(uv_loop_t* loop) {
   SLIST_INIT(&at_exit_callbacks_);
   loop_ = loop;
 
-  isolate_ = v8::Isolate::GetCurrent();
-  if (isolate_ == NULL) {
-    isolate_ = v8::Isolate::New();
-    isolate_->Enter();
+  v8_isolate_ = v8::Isolate::GetCurrent();
+  if (v8_isolate_ == NULL) {
+    v8_isolate_ = v8::Isolate::New();
+    v8_isolate_->Enter();
   }
 
-  assert(isolate_->GetData() == NULL);
-  isolate_->SetData(this);
+  assert(v8_isolate_->GetData() == NULL);
+  v8_isolate_->SetData(this);
 
   globals_init(&globals_);
 }
diff --git a/src/node_isolate.h b/src/node_isolate.h
index 5fe8db9..e24bde1 100644
--- a/src/node_isolate.h
+++ b/src/node_isolate.h
@@ -57,9 +57,9 @@ public:
     return loop_;
   }
 
-  operator v8::Isolate*() {
+  v8::Isolate* GetV8Isolate() {
     NODE_ISOLATE_CHECK(this);
-    return isolate_;
+    return v8_isolate_;
   }
 
   /* Register a handler that should run when the current isolate exits.
@@ -82,7 +82,7 @@ private:
   };
 
   SLIST_HEAD(AtExitCallbacks, AtExitCallbackInfo) at_exit_callbacks_;
-  v8::Isolate* isolate_;
+  v8::Isolate* v8_isolate_;
   uv_loop_t* loop_;
 
   // Global variables for this isolate.
-- 
2.7.4