summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Kornienko <alexfh@google.com>2014-02-05 16:56:37 +0000
committerAlexander Kornienko <alexfh@google.com>2014-02-05 16:56:37 +0000
commit0644c7a8aba4defca316c6dfa3485a79fe71e2b6 (patch)
tree9eaccfb76a53110a32acc9abca35d65cd59ac17c /include
parent6c0351c9963e693c8530b300b66726fd78287be1 (diff)
downloadllvm-0644c7a8aba4defca316c6dfa3485a79fe71e2b6.tar.gz
llvm-0644c7a8aba4defca316c6dfa3485a79fe71e2b6.tar.bz2
llvm-0644c7a8aba4defca316c6dfa3485a79fe71e2b6.tar.xz
Fix an invalid check for duplicate option categories.
Summary: The check performed in the comparator is invalid, as some STL implementations enforce strict weak ordering by calling the comparator with the same value. This check was also in a wrong place: the assertion would only fire when -help was used. The new check is performed each time the category is registered (we are not going to have thousands of them, so it's fine to do it in O(N^2)). Reviewers: jordan_rose Reviewed By: jordan_rose CC: cfe-commits, alexmc Differential Revision: http://llvm-reviews.chandlerc.com/D2699 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200853 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/llvm/Support/CommandLine.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index 515b0bd00f..b29fc87360 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -149,8 +149,8 @@ private:
public:
OptionCategory(const char *const Name, const char *const Description = 0)
: Name(Name), Description(Description) { registerCategory(); }
- const char *getName() { return Name; }
- const char *getDescription() { return Description; }
+ const char *getName() const { return Name; }
+ const char *getDescription() const { return Description; }
};
// The general Option Category (used as default category).