Merge pull request #4540 from murgatroid99/node_minor_fixes

Fix a couple of minor issues in the Node library
pull/4560/head
Michael Lumish 9 years ago
commit d5e59e2a4a
  1. 2
      src/node/ext/call_credentials.cc
  2. 2
      src/node/ext/timeval.cc

@ -32,6 +32,8 @@
*/ */
#include <node.h> #include <node.h>
#include <nan.h>
#include <uv.h>
#include "grpc/grpc.h" #include "grpc/grpc.h"
#include "grpc/grpc_security.h" #include "grpc/grpc_security.h"

@ -46,7 +46,7 @@ gpr_timespec MillisecondsToTimespec(double millis) {
} else if (millis == -std::numeric_limits<double>::infinity()) { } else if (millis == -std::numeric_limits<double>::infinity()) {
return gpr_inf_past(GPR_CLOCK_REALTIME); return gpr_inf_past(GPR_CLOCK_REALTIME);
} else { } else {
return gpr_time_from_micros(static_cast<int64_t>(millis * 1000), return gpr_time_from_micros(static_cast<long>(millis * 1000),
GPR_CLOCK_REALTIME); GPR_CLOCK_REALTIME);
} }
} }

Loading…
Cancel
Save