diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-11 03:36:04 +0400 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-06-11 03:36:04 +0400 |
| commit | 1a09da6ec219883668564d5d6cd30e8867d7e97d (patch) | |
| tree | fda9b632fa5ab280286a2f0c1076bbaa008be362 /src/node_dtrace.cc | |
| parent | ab50fad63bcbedd7c935a9c5d2ab9e4c7202c9f2 (diff) | |
| parent | 1cb6f1a46ad24c60ab1fccfa3f88aad9401e6444 (diff) | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/api.cc
deps/v8/src/unicode-inl.h
deps/v8/src/unicode.h
lib/_stream_readable.js
lib/http.js
src/cares_wrap.cc
src/node.cc
src/node_crypto.cc
src/node_dtrace.cc
src/node_file.cc
src/node_stat_watcher.cc
src/node_version.h
src/process_wrap.cc
src/string_bytes.cc
src/string_bytes.h
src/udp_wrap.cc
src/util.h
test/simple/test-buffer.js
test/simple/test-stream2-compatibility.js
Diffstat (limited to 'src/node_dtrace.cc')
| -rw-r--r-- | src/node_dtrace.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index 53724307c6c..6e5e31083f3 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -20,6 +20,8 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. +#include "util.h" + #ifdef HAVE_DTRACE #include "node_dtrace.h" #include "node_provider.h" @@ -74,7 +76,7 @@ using v8::Value; return env->ThrowError( \ "expected object for " #obj " to contain string member " #member); \ } \ - String::Utf8Value _##member(obj->Get(OneByteString(env->isolate(), \ + node::Utf8Value _##member(obj->Get(OneByteString(env->isolate(), \ #member))); \ if ((*(const char **)valp = *_##member) == NULL) \ *(const char **)valp = "<unknown>"; @@ -217,7 +219,7 @@ void DTRACE_HTTP_SERVER_REQUEST(const FunctionCallbackInfo<Value>& args) { } Local<Value> strfwdfor = headers->Get(env->x_forwarded_string()); - String::Utf8Value fwdfor(strfwdfor); + node::Utf8Value fwdfor(strfwdfor); if (!strfwdfor->IsString() || (req.forwardedFor = *fwdfor) == NULL) req.forwardedFor = const_cast<char*>(""); |