Merge release-0_15 into master

9 years ago · 7d315da83d
parent 6cf35fd4a5 eede0aa182
commit 7d315da83d
1 changed files with 2 additions and 2 deletions
--- a/src/node/ext/node_grpc.cc
+++ b/src/node/ext/node_grpc.cc
@ -265,8 +265,8 @@ void InitLogConstants(Local<Object> exports) {
  Nan::Set(log_verbosity, Nan::New("DEBUG").ToLocalChecked(), DEBUG);
  Local<Value> INFO(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_INFO));
  Nan::Set(log_verbosity, Nan::New("INFO").ToLocalChecked(), INFO);
-  Local<Value> ERROR(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_ERROR));
-  Nan::Set(log_verbosity, Nan::New("ERROR").ToLocalChecked(), ERROR);
+  Local<Value> LOG_ERROR(Nan::New<Uint32, uint32_t>(GPR_LOG_SEVERITY_ERROR));
+  Nan::Set(log_verbosity, Nan::New("ERROR").ToLocalChecked(), LOG_ERROR);
 }

 NAN_METHOD(MetadataKeyIsLegal) {