diff options
author | Brad King <brad.king@kitware.com> | 2019-07-29 15:56:07 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-29 15:56:29 (GMT) |
commit | f6df9c2565ed00ec6f57c32a36dd451c60917f97 (patch) | |
tree | bf41a397e5b6ed6486534a6f1dff9b15639ae455 /Source/cmSystemTools.h | |
parent | f22a2a1fa536127739baa8f6e020d9972adeb5c2 (diff) | |
parent | ec892a572bc6fa197b8836e4f186b2fc80ff03c9 (diff) | |
download | CMake-f6df9c2565ed00ec6f57c32a36dd451c60917f97.zip CMake-f6df9c2565ed00ec6f57c32a36dd451c60917f97.tar.gz CMake-f6df9c2565ed00ec6f57c32a36dd451c60917f97.tar.bz2 |
Merge topic 'modernize_string_view_cmOutputConverter'
ec892a572b cmOutputConverter: Make shell escaping methods cm::string_view based
8573e20c43 cmOutputConverter: Let GetFortranFormat accept a cm::string_view
4911762358 cmOutputConverter: Return bool instead of int in utility functions
a929255dec cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view
1b30b28c04 cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view
6675f785be cmOutputConverter: Let EscapeForCMake accept a cm::string_view
09977c1816 cmSystemTool: Let TrimWhitespace accept a cm::string_view
2f19e53705 cmSystemTool: Let HelpFileName accept a cm::string_view
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3615
Diffstat (limited to 'Source/cmSystemTools.h')
-rw-r--r-- | Source/cmSystemTools.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 1962389..ac1aa80 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -32,7 +32,7 @@ public: * Expand the ; separated string @a arg into multiple arguments. * All found arguments are appended to @a argsOut. */ - static void ExpandListArgument(const std::string& arg, + static void ExpandListArgument(cm::string_view arg, std::vector<std::string>& argsOut, bool emptyArgs = false); @@ -54,7 +54,7 @@ public: * Same as ExpandListArgument but a new vector is created containing * the expanded arguments from the string @a arg. */ - static std::vector<std::string> ExpandedListArgument(const std::string& arg, + static std::vector<std::string> ExpandedListArgument(cm::string_view arg, bool emptyArgs = false); /** @@ -78,15 +78,15 @@ public: KeyWOW64 view = KeyWOW64_Default); //! Escape quotes in a string. - static std::string EscapeQuotes(const std::string& str); + static std::string EscapeQuotes(cm::string_view str); /** Map help document name to file name. */ - static std::string HelpFileName(std::string); + static std::string HelpFileName(cm::string_view); /** * Returns a string that has whitespace removed from the start and the end. */ - static std::string TrimWhitespace(const std::string& s); + static std::string TrimWhitespace(cm::string_view str); using MessageCallback = std::function<void(const std::string&, const char*)>; /** |