diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-01-23 18:26:24 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-01-23 18:26:24 -0800 |
| commit | b44e089d296b5cbc790df122196cb7f2a728e80d (patch) | |
| tree | 41e6bdbcffae9c7da0ba356683113f38c2c219f5 /src/node/ext/call_credentials.h | |
| parent | e42f0b21600b9eb0f65c198ea99f0883bbde9693 (diff) | |
| parent | 889b0a45352928e2a815c34d5f849be9641284b0 (diff) | |
Merge branch 'master' into packet-coalescing-core
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; |