aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/node/ext/channel.cc
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-10-07 16:33:29 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-10-07 16:33:29 -0700
commit68a77e3260d20e95806ab4ecd1c5fd0b85a0ea69 (patch)
tree5ec10201accae77462009b3dc3fcba6d5a9efc0e /src/node/ext/channel.cc
parent6a739c715321c7249ce17b3ff3fbd6594c10af2f (diff)
parentb53b36e2b7fced8440241d58c3e24a3ece108cb6 (diff)
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'src/node/ext/channel.cc')
-rw-r--r--src/node/ext/channel.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/node/ext/channel.cc b/src/node/ext/channel.cc
index 6eb1e77688..a328c01713 100644
--- a/src/node/ext/channel.cc
+++ b/src/node/ext/channel.cc
@@ -42,7 +42,7 @@
#include "call.h"
#include "channel.h"
#include "completion_queue_async_worker.h"
-#include "credentials.h"
+#include "channel_credentials.h"
#include "timeval.h"
namespace grpc {
@@ -112,11 +112,11 @@ NAN_METHOD(Channel::New) {
// Owned by the Channel object
Utf8String host(info[0]);
grpc_credentials *creds;
- if (!Credentials::HasInstance(info[1])) {
+ if (!ChannelCredentials::HasInstance(info[1])) {
return Nan::ThrowTypeError(
- "Channel's second argument must be a credential");
+ "Channel's second argument must be a ChannelCredentials");
}
- Credentials *creds_object = ObjectWrap::Unwrap<Credentials>(
+ ChannelCredentials *creds_object = ObjectWrap::Unwrap<ChannelCredentials>(
Nan::To<Object>(info[1]).ToLocalChecked());
creds = creds_object->GetWrappedCredentials();
grpc_channel_args *channel_args_ptr;