diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-08 13:47:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-08 13:49:35 (GMT) |
| commit | 89ca5d7fdce7730f38a719683059bbe02e6fb19d (patch) | |
| tree | 8f9141729231e42ee47a2837d986801ee423607b /Source/cmSystemTools.h | |
| parent | bf1279450496db727a646afb29109cb9eba3c7b4 (diff) | |
| parent | 82edd98300b9d050dd28fdfa1e6ea7b18ecca22c (diff) | |
| download | CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.zip CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.tar.gz CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.tar.bz2 | |
Merge topic 'message-stdstring'
82edd98300 cmSystemTools: MessageCallback and Message() accept std::string argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2929
Diffstat (limited to 'Source/cmSystemTools.h')
| -rw-r--r-- | Source/cmSystemTools.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 798bcba..88758a6 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -56,7 +56,7 @@ public: */ static std::string TrimWhitespace(const std::string& s); - using MessageCallback = std::function<void(const char*, const char*)>; + using MessageCallback = std::function<void(const std::string&, const char*)>; /** * Set the function used by GUIs to display error messages * Function gets passed: message as a const char*, @@ -74,11 +74,7 @@ public: /** * Display a message. */ - static void Message(const char* m, const char* title = nullptr); - static void Message(const std::string& m, const char* title = nullptr) - { - Message(m.c_str(), title); - } + static void Message(const std::string& m, const char* title = nullptr); using OutputCallback = std::function<void(std::string const&)>; |