Fix CI system error due to the project build env update
And use C++20 for string::ends_with() function.
This commit is contained in:
parent
4b539b4d5d
commit
c64049a1e6
|
@ -961,7 +961,7 @@ bool buf2Clipborad(const std::vector<Buffer*>& buffers, bool isFullPath, HWND hw
|
|||
if (fileName)
|
||||
selection += fileName;
|
||||
}
|
||||
if (!selection.empty() && !endsWith(selection, crlf))
|
||||
if (!selection.empty() && ! selection.ends_with(crlf))
|
||||
selection += crlf;
|
||||
}
|
||||
if (!selection.empty())
|
||||
|
@ -1373,16 +1373,6 @@ void trim(generic_string& str)
|
|||
else str.erase(str.begin(), str.end());
|
||||
}
|
||||
|
||||
bool endsWith(const generic_string& s, const generic_string& suffix)
|
||||
{
|
||||
#if defined(_MSVC_LANG) && (_MSVC_LANG > 201402L)
|
||||
return s.ends_with(suffix);
|
||||
#else
|
||||
size_t pos = s.find(suffix);
|
||||
return pos != s.npos && ((s.length() - pos) == suffix.length());
|
||||
#endif
|
||||
}
|
||||
|
||||
int nbDigitsFromNbLines(size_t nbLines)
|
||||
{
|
||||
int nbDigits = 0; // minimum number of digit should be 4
|
||||
|
|
|
@ -225,7 +225,6 @@ template<typename T> size_t vecRemoveDuplicates(std::vector<T>& vec, bool isSort
|
|||
}
|
||||
|
||||
void trim(generic_string& str);
|
||||
bool endsWith(const generic_string& s, const generic_string& suffix);
|
||||
|
||||
int nbDigitsFromNbLines(size_t nbLines);
|
||||
|
||||
|
|
|
@ -457,7 +457,7 @@ private:
|
|||
if (extIndex >= 0 && extIndex < static_cast<int>(_filterSpec.size()))
|
||||
{
|
||||
const generic_string ext = get1stExt(_filterSpec[extIndex].ext);
|
||||
if (!endsWith(ext, _T(".*")))
|
||||
if (!ext.ends_with(_T(".*")))
|
||||
return replaceExt(name, ext);
|
||||
}
|
||||
return false;
|
||||
|
@ -707,7 +707,7 @@ public:
|
|||
if (!hasExt(newFileName))
|
||||
{
|
||||
const generic_string ext = get1stExt(_filterSpec[_fileTypeIndex].ext);
|
||||
if (!endsWith(ext, _T(".*")))
|
||||
if (!ext.ends_with(_T(".*")))
|
||||
newFileName += ext;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
version: 8.4.{build}
|
||||
image: Visual Studio 2019
|
||||
image: Visual Studio 2022
|
||||
|
||||
#skip_commits:
|
||||
# files:
|
||||
|
|
Loading…
Reference in New Issue