tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Don Ho 2022-10-05 17:24:53 +02:00
parent 4b539b4d5d
commit c64049a1e6
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -961,7 +961,7 @@ bool buf2Clipborad(const std::vector<Buffer*>& buffers, bool isFullPath, HWND hw
if (fileName) if (fileName)
selection += fileName; selection += fileName;
} }
if (!selection.empty() && !endsWith(selection, crlf)) if (!selection.empty() && ! selection.ends_with(crlf))
selection += crlf; selection += crlf;
} }
if (!selection.empty()) if (!selection.empty())
@ -1373,16 +1373,6 @@ void trim(generic_string& str)
else str.erase(str.begin(), str.end()); 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 nbDigitsFromNbLines(size_t nbLines)
{ {
int nbDigits = 0; // minimum number of digit should be 4 int nbDigits = 0; // minimum number of digit should be 4

1
PowerEditor/src/MISC/Common/Common.h
View File

@ -225,7 +225,6 @@ template<typename T> size_t vecRemoveDuplicates(std::vector<T>& vec, bool isSort
} }
void trim(generic_string& str); void trim(generic_string& str);
bool endsWith(const generic_string& s, const generic_string& suffix);
int nbDigitsFromNbLines(size_t nbLines); int nbDigitsFromNbLines(size_t nbLines);

4
PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
View File

@ -457,7 +457,7 @@ private:
if (extIndex >= 0 && extIndex < static_cast<int>(_filterSpec.size())) if (extIndex >= 0 && extIndex < static_cast<int>(_filterSpec.size()))
{ {
const generic_string ext = get1stExt(_filterSpec[extIndex].ext); const generic_string ext = get1stExt(_filterSpec[extIndex].ext);
if (!endsWith(ext, _T(".*"))) if (!ext.ends_with(_T(".*")))
return replaceExt(name, ext); return replaceExt(name, ext);
} }
return false; return false;
@ -707,7 +707,7 @@ public:
if (!hasExt(newFileName)) if (!hasExt(newFileName))
{ {
const generic_string ext = get1stExt(_filterSpec[_fileTypeIndex].ext); const generic_string ext = get1stExt(_filterSpec[_fileTypeIndex].ext);
if (!endsWith(ext, _T(".*"))) if (!ext.ends_with(_T(".*")))
newFileName += ext; newFileName += ext;
} }
} }

2
appveyor.yml
View File

@ -1,5 +1,5 @@
version: 8.4.{build} version: 8.4.{build}
image: Visual Studio 2019 image: Visual Studio 2022
#skip_commits: #skip_commits:
# files: # files: