diff options
author | 2016-03-03 17:14:28 +0200 | |
---|---|---|
committer | 2016-03-03 17:14:28 +0200 | |
commit | 0a10805acc189a36eecb4d49b858bd911bc45f4e (patch) | |
tree | 05ab3e32da5a284c50b2b186be2a7857bb364382 /src/rpc-server/trex_rpc_server_api.h | |
parent | 951a503356fd359407a8fae791b75fa8881dc04c (diff) | |
parent | 2760d0eef3076580f3d112c2e754e108f6028dc7 (diff) |
Merge Console merge
Diffstat (limited to 'src/rpc-server/trex_rpc_server_api.h')
-rw-r--r-- | src/rpc-server/trex_rpc_server_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc-server/trex_rpc_server_api.h b/src/rpc-server/trex_rpc_server_api.h index 1ab5dce9..a02b2cc0 100644 --- a/src/rpc-server/trex_rpc_server_api.h +++ b/src/rpc-server/trex_rpc_server_api.h @@ -133,6 +133,7 @@ protected: std::thread *m_thread; std::string m_name; std::mutex *m_lock; + std::mutex m_dummy_lock; }; /** @@ -147,7 +148,6 @@ public: /* creates the collection of servers using configurations */ TrexRpcServer(const TrexRpcServerConfig *req_resp_cfg, - const TrexRpcServerConfig *async_cfg, std::mutex *m_lock = NULL); ~TrexRpcServer(); |