diff options
author | Vizerai <jsking@google.com> | 2017-01-26 13:26:30 -0800 |
---|---|---|
committer | Vizerai <jsking@google.com> | 2017-01-26 13:26:30 -0800 |
commit | e0cd44aa01cfa697002c7c8884f98d65cc2f7ebd (patch) | |
tree | c44e00ea6e4a6350d2af4f514ac268bb9a224544 /src/node/ext/call_credentials.h | |
parent | b0b86d7504dc7cf25d2616927196203c8ee41373 (diff) | |
parent | 1291fd4b2f9f502f412c3d6cd5dd5fdc18092842 (diff) |
Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API
Diffstat (limited to 'src/node/ext/call_credentials.h')
-rw-r--r-- | src/node/ext/call_credentials.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/ext/call_credentials.h b/src/node/ext/call_credentials.h index 04c852bea1..21a4b8923e 100644 --- a/src/node/ext/call_credentials.h +++ b/src/node/ext/call_credentials.h @@ -34,7 +34,7 @@ #ifndef GRPC_NODE_CALL_CREDENTIALS_H_ #define GRPC_NODE_CALL_CREDENTIALS_H_ -#include <list> +#include <queue> #include <node.h> #include <nan.h> @@ -84,7 +84,7 @@ typedef struct plugin_callback_data { typedef struct plugin_state { Nan::Callback *callback; - std::list<plugin_callback_data*> *pending_callbacks; + std::queue<plugin_callback_data*> *pending_callbacks; uv_mutex_t plugin_mutex; // async.data == this uv_async_t plugin_async; |