mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-09-24 23:28:41 +00:00
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> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201727 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -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(); }
|
||||
|
||||
|
Reference in New Issue
Block a user