diff --git a/src/CLI2.cpp b/src/CLI2.cpp index 3a5c2651f..c31951f18 100644 --- a/src/CLI2.cpp +++ b/src/CLI2.cpp @@ -923,8 +923,7 @@ void CLI2::canonicalizeNames () std::string name = a.attribute ("name"); std::string canonical; if (canonicalize (canonical, "pseudo", name) || - canonicalize (canonical, "attribute", name) || - canonicalize (canonical, "uda", name)) + canonicalize (canonical, "attribute", name)) { a.attribute ("canonical", canonical); } @@ -1116,8 +1115,7 @@ void CLI2::desugarFilterAttributes () reconstructed.push_back (lhs); found = true; } - else if (canonicalize (canonical, "attribute", name) || - canonicalize (canonical, "uda", name)) + else if (canonicalize (canonical, "attribute", name)) { // Certain attribute types do not suport math. // string --> no diff --git a/src/commands/CmdUnique.cpp b/src/commands/CmdUnique.cpp index 839001e2f..2e54caad0 100644 --- a/src/commands/CmdUnique.cpp +++ b/src/commands/CmdUnique.cpp @@ -73,8 +73,7 @@ int CmdUnique::execute (std::string& output) throw std::string (STRING_CMD_UNIQUE_MISSING); std::string canonical; - if (! context.cli2.canonicalize (canonical, "attribute", attribute) && - ! context.cli2.canonicalize (canonical, "uda", attribute)) + if (! context.cli2.canonicalize (canonical, "attribute", attribute)) throw std::string (STRING_CMD_UNIQUE_VALID); // Find number of matching tasks.