Fix things that node-usb#48 (NAN) broke

Author: kevinmehall

src/device.cc

@@ -24,7 +24,7 @@ Device::~Device(){
 }
 
 // Map pinning each libusb_device to a particular V8 instance
-std::map<libusb_device*, Handle<Value> > Device::byPtr;
+std::map<libusb_device*, _NanWeakCallbackInfo<Value, libusb_device>*> Device::byPtr;
 
 NAN_WEAK_CALLBACK(DeviceWeakCallback) {
 	Device::unpin(data.GetParameter());
@@ -35,12 +35,12 @@ NAN_WEAK_CALLBACK(DeviceWeakCallback) {
 Handle<Value> Device::get(libusb_device* dev){
 	auto it = byPtr.find(dev);
 	if (it != byPtr.end()){
-		return NanNew(it->second);
+		return NanNew(it->second->persistent);
 	}else{
 		Handle<Value> v = pDevice.create(new Device(dev));
-		NanMakeWeakPersistent(v, dev, DeviceWeakCallback);
-		byPtr.insert(std::make_pair(dev, v));
-		return v;	
+		auto p = NanMakeWeakPersistent(v, dev, DeviceWeakCallback);
+		byPtr.insert(std::make_pair(dev, p));
+		return v;
 	}
 }
 

src/node_usb.h

@@ -38,7 +38,7 @@ struct Device: public node::ObjectWrap {
 	static void unpin(libusb_device* device);
 
 	protected:
-		static std::map<libusb_device*, Handle<Value> > byPtr;
+		static std::map<libusb_device*, _NanWeakCallbackInfo<Value, libusb_device>*> byPtr;
 		Device(libusb_device* d);
 };
 
@@ -63,14 +63,14 @@ extern Proto<Transfer> pTransfer;
 
 #define CHECK_USB(r) \
 	if (r < LIBUSB_SUCCESS) { \
-		NanThrowError(libusbException(r)); \
+		return NanThrowError(libusbException(r)); \
 	}
 
 #define CALLBACK_ARG(CALLBACK_ARG_IDX) \
 	Local<Function> callback; \
 	if (args.Length() > (CALLBACK_ARG_IDX)) { \
 		if (!args[CALLBACK_ARG_IDX]->IsFunction()) { \
-			NanThrowTypeError("Argument " #CALLBACK_ARG_IDX " must be a function"); \
+			return NanThrowTypeError("Argument " #CALLBACK_ARG_IDX " must be a function"); \
 		} \
 		callback = Local<Function>::Cast(args[CALLBACK_ARG_IDX]); \
 	} \

src/protobuilder.h

@@ -8,9 +8,9 @@ using namespace v8;
 #define V8STR(str) NanNew<String>(str)
 #define V8SYM(str) NanNew<String>(str)
 
-#define THROW_BAD_ARGS(FAIL_MSG) NanThrowError(FAIL_MSG);
-#define THROW_ERROR(FAIL_MSG) NanThrowTypeError(FAIL_MSG);
-#define CHECK_N_ARGS(MIN_ARGS) if (args.Length() < MIN_ARGS) THROW_BAD_ARGS("Expected " #MIN_ARGS " arguments")
+#define THROW_BAD_ARGS(FAIL_MSG) return NanThrowTypeError(FAIL_MSG);
+#define THROW_ERROR(FAIL_MSG) return NanThrowError(FAIL_MSG);
+#define CHECK_N_ARGS(MIN_ARGS) if (args.Length() < MIN_ARGS) { THROW_BAD_ARGS("Expected " #MIN_ARGS " arguments") }
 
 const PropertyAttribute CONST_PROP = static_cast<PropertyAttribute>(ReadOnly|DontDelete);
 
@@ -116,13 +116,13 @@ inline static void setConst(Handle<Object> obj, const char* const name, Handle<V
 
 #define ENTER_CONSTRUCTOR(MIN_ARGS) \
 	NanScope();              \
-	if (!args.IsConstructCall()) THROW_ERROR("Must be called with `new`!"); \
+	if (!args.IsConstructCall()) return NanThrowError("Must be called with `new`!"); \
 	CHECK_N_ARGS(MIN_ARGS);
 
 #define ENTER_CONSTRUCTOR_POINTER(PROTO, MIN_ARGS) \
 	ENTER_CONSTRUCTOR(MIN_ARGS)                    \
 	if (!args.Length() || !args[0]->IsExternal()){ \
-		THROW_BAD_ARGS("This type cannot be created directly!"); \
+		return NanThrowError("This type cannot be created directly!"); \
 	}                                               \
 	auto self = (PROTO)._wrap(args.This(), args[0]); \
 	(void) self