diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-11 15:30:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-11 15:32:43 (GMT) |
| commit | 950c099d83757acd57cec78a3579ea1f6aaddf96 (patch) | |
| tree | 87862c59076f42dc9c4be9c8c002e1fccfdb90cd /Source/cmServer.cxx | |
| parent | 8a1d25afdf92cabab88598cc9b9e5a9fb2a9493b (diff) | |
| download | CMake-950c099d83757acd57cec78a3579ea1f6aaddf96.zip CMake-950c099d83757acd57cec78a3579ea1f6aaddf96.tar.gz CMake-950c099d83757acd57cec78a3579ea1f6aaddf96.tar.bz2 | |
cmake: Progress functions use `std::string` param
Diffstat (limited to 'Source/cmServer.cxx')
| -rw-r--r-- | Source/cmServer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx index 719e6b1..1903fd9 100644 --- a/Source/cmServer.cxx +++ b/Source/cmServer.cxx @@ -103,7 +103,7 @@ void cmServer::ProcessRequest(cmConnection* connection, if (this->Protocol) { this->Protocol->CMakeInstance()->SetProgressCallback( - [&request](const char* msg, float prog) { + [&request](const std::string& msg, float prog) { reportProgress(msg, prog, request); }); this->WriteResponse(connection, this->Protocol->Process(request), @@ -155,7 +155,7 @@ void cmServer::PrintHello(cmConnection* connection) const this->WriteJsonObject(connection, hello, nullptr); } -void cmServer::reportProgress(const char* msg, float progress, +void cmServer::reportProgress(const std::string& msg, float progress, const cmServerRequest& request) { if (progress < 0.0f || progress > 1.0f) { |