From 511af4dd5fb4d48f1aeabcd93b09fb1f2738e1b2 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 30 Jul 2013 21:28:43 +0200 Subject: string_bytes: don't use named imports in header It imports the definition into every source file that includes string_bytes.h, as evidenced by the build suddenly breaking left and right because of missing Handle/Local/String/Value imports. --- src/string_bytes.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/string_bytes.h') 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 -- cgit v1.2.3