diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-18 15:13:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-18 15:14:02 (GMT) |
| commit | fc4f3525133270ccc33ccda6acff6f85006ab457 (patch) | |
| tree | 31473b60683d51e6c0b747c502bc6f2098f66c56 /Source/cmServerProtocol.cxx | |
| parent | 407c7415f41fc27578bb0ab2c831e767de575531 (diff) | |
| parent | cf0ae55dcb9224b92a95166f17452c56ba5b6213 (diff) | |
| download | CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.zip CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.tar.gz CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.tar.bz2 | |
Merge topic 'server-refactor'
cf0ae55d server: Add support for connections that aren't event based
5ddfb6a4 server: Add connection as part of a request
d4f5d35c server: Refactor to make the event loop owned by server object
5acbf08b Tests: Teach Server test to forward exit code from server process
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !552
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 21b69cf..8ad4916 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -128,11 +128,13 @@ void getCMakeInputs(const cmGlobalGenerator* gg, const std::string& sourceDir, } // namespace -cmServerRequest::cmServerRequest(cmServer* server, const std::string& t, - const std::string& c, const Json::Value& d) +cmServerRequest::cmServerRequest(cmServer* server, cmConnection* connection, + const std::string& t, const std::string& c, + const Json::Value& d) : Type(t) , Cookie(c) , Data(d) + , Connection(connection) , m_Server(server) { } |