diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-21 14:05:34 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-21 10:06:20 -0400 |
| commit | d44340115fbe365916463902443d558264bcd619 (patch) | |
| tree | ccf800f4c582b0564849b550236f86efff1db7da /Utilities | |
| parent | 32c0f964bce6fcdee38db8614b0aa8d3aaa3a07d (diff) | |
| parent | ee9805ccd17670e945e41e62f160bfdd9ad8a386 (diff) | |
| download | cmake-d44340115fbe365916463902443d558264bcd619.tar.gz | |
Merge topic 'filesystem-path-c++03-abi' into release-3.25
ee9805ccd1 cm/filesystem: Fix crash with pre-C++11 std::string GNU ABI in C++17
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7813
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/std/cm/filesystem | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Utilities/std/cm/filesystem b/Utilities/std/cm/filesystem index ce52fbf3b3..b1cb3668f4 100644 --- a/Utilities/std/cm/filesystem +++ b/Utilities/std/cm/filesystem @@ -809,13 +809,11 @@ public: path& remove_filename() { -# if defined(__CYGWIN__) - // FIXME: Avoid crash due to CYGWIN/MSYS bug(?). See CMake Issue 22090. - static_cast<void>(this->path_.data()); -# endif auto fname = this->get_filename(); if (!fname.empty()) { - this->path_.erase(fname.data() - this->path_.data()); + this->path_.erase(fname.data() - + // Avoid C++17 non-const .data() that may reallocate. + static_cast<path_type const&>(this->path_).data()); } return *this; } @@ -829,13 +827,11 @@ public: path& replace_extension(const path& replacement = path()) { -# if defined(__CYGWIN__) - // FIXME: Avoid crash due to CYGWIN/MSYS bug(?). See CMake Issue 22090. - static_cast<void>(this->path_.data()); -# endif auto ext = this->get_filename_fragment(filename_fragment::extension); if (!ext.empty()) { - this->path_.erase(ext.data() - this->path_.data()); + this->path_.erase(ext.data() - + // Avoid C++17 non-const .data() that may reallocate. + static_cast<path_type const&>(this->path_).data()); } if (!replacement.path_.empty()) { if (replacement.path_[0] != '.') { |