razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix build for Visual Studio 2019

Browse source
This commit is contained in:
Tact Yoshida 2020-01-14 14:21:32 +09:00 committed by manongjohn
parent b926bc7c42
commit 849dadcf5b
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/common/tsystem/tsystem.cpp
View file

@ -468,13 +468,11 @@ void TSystem::readDirectory_DirItems(QStringList &dst, const TFilePath &path) {
#ifdef _WIN32
// equivalent to sorting with QDir::LocaleAware
struct strCompare {
bool operator()(const QString &s1, const QString &s2) const {
return QString::localeAwareCompare(s1, s2) < 0;
}
auto const strCompare = [](const QString &s1, const QString &s2) {
return QString::localeAwareCompare(s1, s2) < 0;
};
std::set<QString, strCompare> entries;
std::set<QString, decltype(strCompare)> entries(strCompare);
WIN32_FIND_DATA find_dir_data;
QString dir_search_path = dir.absolutePath() + "\\*";

4
toonz/sources/include/ext/plasticdeformer.h
View file

@ -53,10 +53,6 @@ public:
PlasticDeformer();
~PlasticDeformer();
friend void swap(PlasticDeformer &a, PlasticDeformer &b) {
std::swap(a.m_imp, b.m_imp);
}
/*!
Returns whether the last compilation procedure succeeded, or it either failed
or was never invoked after the last initialize() call.