diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-25 13:14:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-25 13:14:21 (GMT) |
| commit | f3b4a12c610e6c4fc37ea03c902c354228208726 (patch) | |
| tree | d0fb1fd19534150104ec455cce1903cc972b46b3 /Source | |
| parent | 40768761b65e7644674f894a9dfff05c06515d72 (diff) | |
| parent | c7f3663b10178e3324bb22759198b19c7c3aa8c2 (diff) | |
| download | CMake-f3b4a12c610e6c4fc37ea03c902c354228208726.zip CMake-f3b4a12c610e6c4fc37ea03c902c354228208726.tar.gz CMake-f3b4a12c610e6c4fc37ea03c902c354228208726.tar.bz2 | |
Merge topic 'return-explicit-conversion'
c7f3663b10 cmServerConnection: make return conversions explicit
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3000
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmServerConnection.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index 844a858..a878890 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -29,7 +29,7 @@ cm::uv_stream_ptr cmStdIoConnection::SetupStream(int file_id) tty.init(*this->Server->GetLoop(), file_id, file_id == 0, static_cast<cmEventBasedConnection*>(this)); uv_tty_set_mode(tty, UV_TTY_MODE_NORMAL); - return std::move(tty); + return { std::move(tty) }; } case UV_FILE: if (file_id == 0) { @@ -43,7 +43,7 @@ cm::uv_stream_ptr cmStdIoConnection::SetupStream(int file_id) pipe.init(*this->Server->GetLoop(), 0, static_cast<cmEventBasedConnection*>(this)); uv_pipe_open(pipe, file_id); - return std::move(pipe); + return { std::move(pipe) }; } default: assert(false && "Unable to determine stream type"); |