diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-15 13:27:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-15 13:27:42 (GMT) |
| commit | a84c99694745b57cd570c33ea46d68b0a917aace (patch) | |
| tree | 70b3986cc3b1efc39501becb1f2d3b7a7a0b78e2 /Utilities | |
| parent | 0b62dede642dcb4b961b2459a2cb2480c5fc432a (diff) | |
| parent | b65d54e87694efb4962cd37348aec0ba598e5d4e (diff) | |
| download | CMake-a84c99694745b57cd570c33ea46d68b0a917aace.zip CMake-a84c99694745b57cd570c33ea46d68b0a917aace.tar.gz CMake-a84c99694745b57cd570c33ea46d68b0a917aace.tar.bz2 | |
Merge topic 'cmuvprocesschain-external-stream-fd'
b65d54e876 cmUVStreambuf: Update URL for example code
0878306386 cmUVStream: Add cmUVStreamRead() function
b8fd273ed7 cmUVProcessChain: Return output and error streams as file descriptors
ec81d40be4 cmUVPipeIStream: Add cmUVPipeIStream
3b6c5efc08 cm::append: Add support for std::basic_string on SPARC/SunPro
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8559
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/std/cmext/algorithm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Utilities/std/cmext/algorithm b/Utilities/std/cmext/algorithm index 11514fc..46377f4 100644 --- a/Utilities/std/cmext/algorithm +++ b/Utilities/std/cmext/algorithm @@ -16,6 +16,7 @@ #if defined(__SUNPRO_CC) && defined(__sparc) # include <list> +# include <string> # include <vector> #endif @@ -67,11 +68,15 @@ namespace cm { APPEND_TWO(C1, C2) \ APPEND_TWO(C2, C1) -// For now, manage only support for std::vector and std::list. -// Other sequential container support can be added if needed. +// For now, manage only support for std::vector, std::list, and +// std::basic_string. Other sequential container support can be added if +// needed. APPEND(std::vector) APPEND(std::list) +APPEND(std::basic_string) APPEND_MIX(std::vector, std::list) +APPEND_MIX(std::vector, std::basic_string) +APPEND_MIX(std::list, std::basic_string) # undef APPEND # undef APPEND_MIX |