maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Avoid collisions with Objective-C++ keywords 

Change parameter names exposed in headers to avoid collisions with Objective-C++
keywords.

Contributed-by: Graham Lee <graham@iamleeg.com>
llvm-svn: 201727
This commit is contained in:
Tobias Grosser 2014-02-19 22:16:53 +00:00
parent ff57ba18b9
commit 8ddf9a1f77
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/Support/CommandLine.h
View File

@ -1026,8 +1026,8 @@ template<> struct applicator<const char*> {
};
template<> struct applicator<NumOccurrencesFlag> {
static void opt(NumOccurrencesFlag NO, Option &O) {
O.setNumOccurrencesFlag(NO);
static void opt(NumOccurrencesFlag N, Option &O) {
O.setNumOccurrencesFlag(N);
}
};
template<> struct applicator<ValueExpected> {
@ -1061,7 +1061,7 @@ class opt_storage {
DataType *Location; // Where to store the object...
OptionValue<DataType> Default;
void check() const {
void check_location() const {
assert(Location != 0 && "cl::location(...) not specified for a command "
"line option with external storage, "
"or cl::init specified before cl::location()!!");
@ -1079,14 +1079,14 @@ public:
template<class T>
void setValue(const T &V, bool initial = false) {
check();
check_location();
*Location = V;
if (initial)
Default = V;
}
DataType &getValue() { check(); return *Location; }
const DataType &getValue() const { check(); return *Location; }
DataType &getValue() { check_location(); return *Location; }
const DataType &getValue() const { check_location(); return *Location; }
operator DataType() const { return this->getValue(); }