diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-10-25 11:26:05 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-10-25 11:26:05 -0700 |
| commit | 61ccaf9a974bedf54622a1d6ad6b6ad00f95f5a5 (patch) | |
| tree | 1dc52d619bd9ad2424bae83d66c837e7eea6ba06 /src/node_file.cc | |
| parent | f153d6da450b6ba5c78381e6e90a7ba243657691 (diff) | |
| parent | 21265e20d3be515733418c5eef395ccec8f5f701 (diff) | |
| download | node-new-61ccaf9a974bedf54622a1d6ad6b6ad00f95f5a5.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
ChangeLog
deps/uv/ChangeLog
deps/uv/include/uv-darwin.h
deps/uv/src/unix/fsevents.c
deps/uv/src/unix/process.c
deps/uv/src/version.c
doc/api/addons.markdown
doc/api/cluster.markdown
doc/api/http.markdown
lib/http.js
lib/tls.js
src/node_crypto.cc
src/node_http_parser.cc
src/node_version.h
src/pipe_wrap.cc
src/v8abbr.h
src/v8ustack.d
test/simple/test-http-pipeline-flood.js
Diffstat (limited to 'src/node_file.cc')
| -rw-r--r-- | src/node_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_file.cc b/src/node_file.cc index 3bf29c8109..cb37124c1a 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -98,7 +98,7 @@ class FSReqWrap: public ReqWrap<uv_fs_t> { #define GET_OFFSET(a) ((a)->IsNumber() ? (a)->IntegerValue() : -1) #define GET_TRUNCATE_LENGTH(a) ((a)->IntegerValue()) -static inline int IsInt64(double x) { +static inline bool IsInt64(double x) { return x == static_cast<double>(static_cast<int64_t>(x)); } |