Rename namespace clang::printf to clang::analyze_printf to avoid problems where the reference to 'printf' is ambiguous.
llvm-svn: 94733
This commit is contained in:
parent
c968f4475e
commit
08ad1cceb3
|
@ -18,7 +18,7 @@
|
|||
#include <cassert>
|
||||
|
||||
namespace clang {
|
||||
namespace printf {
|
||||
namespace analyze_printf {
|
||||
|
||||
class ConversionSpecifier {
|
||||
public:
|
||||
|
@ -61,6 +61,7 @@ public:
|
|||
|
||||
ConversionSpecifier(Kind k) : kind(k) {}
|
||||
|
||||
bool isObjCArg() const { return kind >= ObjCBeg && kind <= ObjCEnd; }
|
||||
bool isIntArg() const { return kind >= dArg && kind <= iArg; }
|
||||
bool isUIntArg() const { return kind >= oArg && kind <= XArg; }
|
||||
bool isDoubleArg() const { return kind >= fArg && kind <= AArg; }
|
||||
|
@ -147,6 +148,10 @@ public:
|
|||
return (LengthModifier) lengthModifier;
|
||||
}
|
||||
|
||||
const OptionalAmount &getFieldWidth() const {
|
||||
return FieldWidth;
|
||||
}
|
||||
|
||||
void setFieldWidth(const OptionalAmount &Amt) {
|
||||
FieldWidth = Amt;
|
||||
}
|
||||
|
@ -154,6 +159,10 @@ public:
|
|||
void setPrecision(const OptionalAmount &Amt) {
|
||||
Precision = Amt;
|
||||
}
|
||||
|
||||
const OptionalAmount &getPrecision() const {
|
||||
return Precision;
|
||||
}
|
||||
|
||||
bool isLeftJustified() const { return flags & LeftJustified; }
|
||||
bool hasPlusPrefix() const { return flags & PlusPrefix; }
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "clang/Analysis/Analyses/PrintfFormatString.h"
|
||||
|
||||
using namespace clang;
|
||||
using namespace printf;
|
||||
using namespace analyze_printf;
|
||||
|
||||
namespace {
|
||||
class FormatSpecifierResult {
|
||||
|
@ -26,7 +26,7 @@ public:
|
|||
FormatSpecifierResult(bool err = false)
|
||||
: Start(0), HasError(err) {}
|
||||
FormatSpecifierResult(const char *start,
|
||||
const printf::FormatSpecifier &fs)
|
||||
const FormatSpecifier &fs)
|
||||
: FS(fs), Start(start), HasError(false) {}
|
||||
|
||||
|
||||
|
@ -37,7 +37,7 @@ public:
|
|||
assert(hasValue());
|
||||
return FS;
|
||||
}
|
||||
const printf::FormatSpecifier &getValue() { return FS; }
|
||||
const FormatSpecifier &getValue() { return FS; }
|
||||
};
|
||||
} // end anonymous namespace
|
||||
|
||||
|
@ -81,7 +81,7 @@ static OptionalAmount ParseAmount(const char *&Beg, const char *E) {
|
|||
return OptionalAmount();
|
||||
}
|
||||
|
||||
static FormatSpecifierResult ParseFormatSpecifier(printf::FormatStringHandler &H,
|
||||
static FormatSpecifierResult ParseFormatSpecifier(FormatStringHandler &H,
|
||||
const char *&Beg, const char *E) {
|
||||
|
||||
const char *I = Beg;
|
||||
|
|
Loading…
Reference in New Issue