Skip to content

Commit e55bf8c

Browse files
committed
[clang] Fix build after upstream change.
b9d678d changes Type.h, needing two downstream updates: - Remove now-redundant Qualifiers ctor. - Avoid ambiguous Type by removing using namespace llvm.
1 parent 6fa4d9b commit e55bf8c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

clang/include/clang/AST/Type.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,6 @@ class Qualifiers {
379379
FastMask = (1 << FastWidth) - 1
380380
};
381381

382-
Qualifiers() : Mask(0) {}
383-
384382
/// Returns the common set of qualifiers while removing them from
385383
/// the given sets.
386384
static Qualifiers removeCommonQualifiers(Qualifiers &L, Qualifiers &R) {

clang/lib/Index/IndexRecordHasher.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
using namespace clang;
2222
using namespace clang::index;
23-
using namespace llvm;
2423

2524
namespace {
2625

@@ -42,7 +41,7 @@ struct IndexRecordHasher {
4241
void hashTemplateName(TemplateName name);
4342
void hashTemplateArg(const TemplateArgument &arg);
4443
void hashLoc(SourceLocation loc, bool includeOffset);
45-
void hashAPInt(const APInt &val);
44+
void hashAPInt(const llvm::APInt &val);
4645
};
4746

4847
class DeclHashVisitor : public ConstDeclVisitor<DeclHashVisitor, void> {
@@ -488,7 +487,7 @@ void IndexRecordHasher::hashLoc(SourceLocation loc, bool includeOffset) {
488487
}
489488
}
490489

491-
void IndexRecordHasher::hashAPInt(const APInt &val) {
490+
void IndexRecordHasher::hashAPInt(const llvm::APInt &val) {
492491
HashBuilder.add(val.getBitWidth());
493492
HashBuilder.addRangeElements(
494493
llvm::ArrayRef(val.getRawData(), val.getNumWords()));

0 commit comments

Comments
 (0)