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.h | |
| 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.h')
| -rw-r--r-- | Source/cmServerProtocol.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h index 4e57bb6..145708c 100644 --- a/Source/cmServerProtocol.h +++ b/Source/cmServerProtocol.h @@ -11,6 +11,7 @@ #include <string> #include <utility> +class cmConnection; class cmFileMonitor; class cmServer; class cmServerRequest; @@ -52,9 +53,11 @@ public: const std::string Type; const std::string Cookie; const Json::Value Data; + cmConnection* Connection; private: - cmServerRequest(cmServer* server, const std::string& t, const std::string& c, + cmServerRequest(cmServer* server, cmConnection* connection, + const std::string& t, const std::string& c, const Json::Value& d); void ReportProgress(int min, int current, int max, |