diff --git a/src/node.cc b/src/node.cc index b16619e572..73cd19aca2 100644 --- a/src/node.cc +++ b/src/node.cc @@ -97,10 +97,12 @@ using v8::Exception; using v8::Function; using v8::FunctionCallbackInfo; using v8::FunctionTemplate; +using v8::Handle; using v8::HandleScope; using v8::HeapStatistics; using v8::Integer; using v8::Isolate; +using v8::Local; using v8::Locker; using v8::Message; using v8::Number; @@ -110,6 +112,7 @@ using v8::Persistent; using v8::PropertyCallbackInfo; using v8::ResourceConstraints; using v8::SetResourceConstraints; +using v8::String; using v8::ThrowException; using v8::TryCatch; using v8::Uint32; diff --git a/src/node_crypto.cc b/src/node_crypto.cc index b978784d1d..574a5ba24b 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -72,6 +72,7 @@ using v8::Exception; using v8::False; using v8::FunctionCallbackInfo; using v8::FunctionTemplate; +using v8::Handle; using v8::HandleScope; using v8::Integer; using v8::Local; @@ -80,6 +81,7 @@ using v8::Object; using v8::Persistent; using v8::String; using v8::ThrowException; +using v8::Value; // Forcibly clear OpenSSL's error stack on return. This stops stale errors diff --git a/src/string_bytes.h b/src/string_bytes.h index 8071a494ae..7d861ff636 100644 --- a/src/string_bytes.h +++ b/src/string_bytes.h @@ -29,25 +29,20 @@ namespace node { -using v8::Handle; -using v8::Local; -using v8::String; -using v8::Value; - class StringBytes { public: // Does the string match the encoding? Quick but non-exhaustive. // Example: a HEX string must have a length that's a multiple of two. // FIXME(bnoordhuis) IsMaybeValidString()? Naming things is hard... - static bool IsValidString(Handle string, enum encoding enc); + static bool IsValidString(v8::Handle string, enum encoding enc); // Fast, but can be 2 bytes oversized for Base64, and // as much as triple UTF-8 strings <= 65536 chars in length - static size_t StorageSize(Handle val, enum encoding enc); + static size_t StorageSize(v8::Handle val, enum encoding enc); // Precise byte count, but slightly slower for Base64 and // very much slower for UTF-8 - static size_t Size(Handle val, enum encoding enc); + static size_t Size(v8::Handle val, enum encoding enc); // Write the bytes from the string or buffer into the char* // returns the number of bytes written, which will always be @@ -55,14 +50,14 @@ class StringBytes { // memory to allocate. static size_t Write(char* buf, size_t buflen, - Handle val, + v8::Handle val, enum encoding enc, int* chars_written = NULL); // Take the bytes in the src, and turn it into a Buffer or String. - static Local Encode(const char* buf, - size_t buflen, - enum encoding encoding); + static v8::Local Encode(const char* buf, + size_t buflen, + enum encoding encoding); }; } // namespace node diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index c014137f57..7a4220a7dc 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -34,8 +34,10 @@ using v8::Exception; using v8::Function; using v8::FunctionCallbackInfo; using v8::FunctionTemplate; +using v8::Handle; using v8::HandleScope; using v8::Integer; +using v8::Local; using v8::Null; using v8::Object; using v8::Persistent;