Update fmtlib

This commit is contained in:
Jack Andersen
2020-04-11 12:49:30 -10:00
parent 40efdcc38c
commit 5112228abd
17 changed files with 176 additions and 172 deletions

View File

@@ -39,9 +39,9 @@ struct AudioGroupDataCollection {
uint32_t absOffs;
uint32_t active;
MetaData(amuse::DataFormat fmtIn, uint32_t absOffsIn, uint32_t activeIn)
: fmt(fmtIn), absOffs(absOffsIn), active(activeIn) {}
: FMT_STRING(fmtIn), absOffs(absOffsIn), active(activeIn) {}
MetaData(athena::io::FileReader& r)
: fmt(amuse::DataFormat(r.readUint32Little())), absOffs(r.readUint32Little()), active(r.readUint32Little()) {}
: FMT_STRING(amuse::DataFormat(r.readUint32Little())), absOffs(r.readUint32Little()), active(r.readUint32Little()) {}
};
std::optional<MetaData> m_metaData;

View File

@@ -167,6 +167,7 @@ bool AudioGroupCollection::doSearch(std::string_view str)
m_filterGroups.clear();
m_filterGroups.reserve(m_groups.size());
for (auto it = m_groups.begin() ; it != m_groups.end() ; ++it)
// TODO: Heterogeneous lookup when C++20 available
if (str.empty() || StrToLower(it->first).find(str.data()) != std::string::npos)
{
m_filterGroups.push_back(it);