Enable creating Locals from Globals under Node 0.10.

Fixes #470
nodejs · Oct 8, 2015 · 9bf9b8b · 9bf9b8b
1 parent eab6d82
commit 9bf9b8b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/nan_implementation_12_inl.h b/nan_implementation_12_inl.h
@@ -396,4 +396,9 @@ inline v8::Local<T> New(Persistent<T, M> const& p) {
   return v8::Local<T>::New(v8::Isolate::GetCurrent(), p);
 }
 
+template <typename T>
+inline v8::Local<T> New(Global<T> const& p) {
+  return v8::Local<T>::New(v8::Isolate::GetCurrent(), p);
+}
+
 #endif  // NAN_IMPLEMENTATION_12_INL_H_
diff --git a/nan_implementation_pre_12_inl.h b/nan_implementation_pre_12_inl.h
@@ -256,4 +256,9 @@ inline v8::Local<T> New(Persistent<T, M> const& p) {
   return v8::Local<T>::New(p.persistent);
 }
 
+template <typename T>
+inline v8::Local<T> New(Global<T> const& p) {
+  return v8::Local<T>::New(p.persistent);
+}
+
 #endif  // NAN_IMPLEMENTATION_PRE_12_INL_H_
diff --git a/nan_new.h b/nan_new.h
@@ -262,6 +262,8 @@ template <typename T> inline v8::Local<T> New(v8::Persistent<T> const& p);
 #endif
 template <typename T, typename M>
 inline v8::Local<T> New(Persistent<T, M> const& p);
+template <typename T>
+inline v8::Local<T> New(Global<T> const& p);
 
 inline
 imp::Factory<v8::Boolean>::return_t

diff --git a/nan_persistent_pre_12_inl.h b/nan_persistent_pre_12_inl.h
@@ -12,8 +12,12 @@
 template<typename T>
 class PersistentBase {
   v8::Persistent<T> persistent;
+  template<typename U>
+  friend v8::Local<U> New(const PersistentBase<U> &p);
   template<typename U, typename M>
   friend v8::Local<U> New(const Persistent<U, M> &p);
+  template<typename U>
+  friend v8::Local<U> New(const Global<U> &p);
   template<typename S> friend class ReturnValue;
 
  public:

diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
@@ -362,6 +362,19 @@ NAN_METHOD(testPersistents) {
   info.GetReturnValue().SetUndefined();
 }
 
+NAN_METHOD(testGlobals) {
+  Tap t(info[0]);
+
+  t.plan(1);
+
+  Nan::Global<String> p;
+  p.Reset(New("foo").ToLocalChecked());
+  t.ok(_( assertType<String>( New(p))));
+  p.Reset();
+
+  info.GetReturnValue().SetUndefined();
+}
+
 //==============================================================================
 // Regression Tests
 //==============================================================================
@@ -473,6 +486,7 @@ NAN_MODULE_INIT(Init) {
   NAN_EXPORT(target, testStringObject);
 
   NAN_EXPORT(target, testPersistents);
+  NAN_EXPORT(target, testGlobals);
 
   NAN_EXPORT(target, testRegression212);
   NAN_EXPORT(target, testRegression242);