gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Column: A std::map was being used as a std::set

Browse Source
This commit is contained in:
Paul Beckingham
2015-11-02 08:13:32 -05:00
parent 1d1be49bbd
commit f64cbe1e81
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/columns/Column.cpp
View File

@@ -27,6 +27,7 @@
#include <cmake.h> #include <cmake.h>
#include <Column.h> #include <Column.h>
#include <algorithm> #include <algorithm>
#include <set>
#include <Context.h> #include <Context.h>
#include <ColDepends.h> #include <ColDepends.h>
#include <ColDescription.h> #include <ColDescription.h>
@@ -148,24 +149,25 @@ void Column::factory (std::map <std::string, Column*>& all)
void Column::uda (std::map <std::string, Column*>& all) void Column::uda (std::map <std::string, Column*>& all)
{ {
// For each UDA, instantiate and initialize ColumnUDA(). // For each UDA, instantiate and initialize ColumnUDA().
std::map <std::string, int> udas; std::set <std::string> udas;
for (auto& i : context.config) for (auto& i : context.config)
{ {
if (i.first.substr (0, 4) == "uda.") if (i.first.substr (0, 4) == "uda.")
{ {
std::string::size_type period = 4; std::string::size_type period = 4; // One byte after the first '.'.
if ((period = i.first.find ('.', period)) != std::string::npos) if ((period = i.first.find ('.', period)) != std::string::npos)
udas[i.first.substr (4, period - 4)] = 0; udas.insert (i.first.substr (4, period - 4));
} }
} }
for (auto& uda : udas) for (auto& uda : udas)
{ {
if (all.find (uda.first) != all.end ()) if (all.find (uda) != all.end ())
throw format (STRING_UDA_COLLISION, uda.first); throw format (STRING_UDA_COLLISION, uda);
Column* c = Column::uda (uda.first); Column* c = Column::uda (uda);
all[c->_name] = c; all[c->_name] = c;
} }
} }