diff options
Diffstat (limited to 'src/node_buffer.h')
| -rw-r--r-- | src/node_buffer.h | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/src/node_buffer.h b/src/node_buffer.h index 568b68f83d..d59c44692b 100644 --- a/src/node_buffer.h +++ b/src/node_buffer.h @@ -24,50 +24,52 @@ NODE_EXTERN size_t Length(v8::Handle<v8::Value> val); NODE_EXTERN size_t Length(v8::Handle<v8::Object> val); // public constructor -NODE_EXTERN v8::Local<v8::Object> New(v8::Isolate* isolate, size_t length); +NODE_EXTERN v8::MaybeLocal<v8::Object> New(v8::Isolate* isolate, size_t length); NODE_DEPRECATED("Use New(isolate, ...)", - inline v8::Local<v8::Object> New(size_t length) { + inline v8::MaybeLocal<v8::Object> New(size_t length) { return New(v8::Isolate::GetCurrent(), length); }) // public constructor from string -NODE_EXTERN v8::Local<v8::Object> New(v8::Isolate* isolate, - v8::Handle<v8::String> string, - enum encoding enc = UTF8); +NODE_EXTERN v8::MaybeLocal<v8::Object> New(v8::Isolate* isolate, + v8::Handle<v8::String> string, + enum encoding enc = UTF8); NODE_DEPRECATED("Use New(isolate, ...)", - inline v8::Local<v8::Object> New(v8::Handle<v8::String> string, - enum encoding enc = UTF8) { + inline v8::MaybeLocal<v8::Object> New( + v8::Handle<v8::String> string, + enum encoding enc = UTF8) { return New(v8::Isolate::GetCurrent(), string, enc); }) // public constructor - data is copied // TODO(trevnorris): should be something like Copy() -NODE_EXTERN v8::Local<v8::Object> New(v8::Isolate* isolate, - const char* data, - size_t len); +NODE_EXTERN v8::MaybeLocal<v8::Object> New(v8::Isolate* isolate, + const char* data, + size_t len); NODE_DEPRECATED("Use New(isolate, ...)", - inline v8::Local<v8::Object> New(const char* data, size_t len) { + inline v8::MaybeLocal<v8::Object> New(const char* data, + size_t len) { return New(v8::Isolate::GetCurrent(), data, len); }) // public constructor - data is used, callback is passed data on object gc -NODE_EXTERN v8::Local<v8::Object> New(v8::Isolate* isolate, - char* data, - size_t length, - FreeCallback callback, - void* hint); +NODE_EXTERN v8::MaybeLocal<v8::Object> New(v8::Isolate* isolate, + char* data, + size_t length, + FreeCallback callback, + void* hint); NODE_DEPRECATED("Use New(isolate, ...)", - inline v8::Local<v8::Object> New(char* data, - size_t length, - FreeCallback callback, - void* hint) { + inline v8::MaybeLocal<v8::Object> New(char* data, + size_t length, + FreeCallback callback, + void* hint) { return New(v8::Isolate::GetCurrent(), data, length, callback, hint); }) // public constructor - data is used. // TODO(trevnorris): should be New() for consistency -NODE_EXTERN v8::Local<v8::Object> Use(v8::Isolate* isolate, - char* data, - size_t len); +NODE_EXTERN v8::MaybeLocal<v8::Object> Use(v8::Isolate* isolate, + char* data, + size_t len); NODE_DEPRECATED("Use Use(isolate, ...)", - inline v8::Local<v8::Object> Use(char* data, size_t len) { + inline v8::MaybeLocal<v8::Object> Use(char* data, size_t len) { return Use(v8::Isolate::GetCurrent(), data, len); }) @@ -90,14 +92,14 @@ static inline bool IsWithinBounds(size_t off, size_t len, size_t max) { // src/node_internals.h due to a circular dependency issue with // the smalloc.h and node_internals.h headers. #if defined(NODE_WANT_INTERNALS) -v8::Local<v8::Object> New(Environment* env, size_t size); -v8::Local<v8::Object> New(Environment* env, const char* data, size_t len); -v8::Local<v8::Object> New(Environment* env, - char* data, - size_t length, - FreeCallback callback, - void* hint); -v8::Local<v8::Object> Use(Environment* env, char* data, size_t length); +v8::MaybeLocal<v8::Object> New(Environment* env, size_t size); +v8::MaybeLocal<v8::Object> New(Environment* env, const char* data, size_t len); +v8::MaybeLocal<v8::Object> New(Environment* env, + char* data, + size_t length, + FreeCallback callback, + void* hint); +v8::MaybeLocal<v8::Object> Use(Environment* env, char* data, size_t length); #endif // defined(NODE_WANT_INTERNALS) } // namespace Buffer |