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

Simplify slightly. 

llvm-svn: 189645
This commit is contained in:
Richard Smith 2013-08-30 04:45:38 +00:00
parent b5a214e4f3
commit 8568e576b0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/AST/DeclAccessPair.h
View File

@ -28,7 +28,7 @@ class NamedDecl;
/// A POD class for pairing a NamedDecl* with an access specifier. /// A POD class for pairing a NamedDecl* with an access specifier.
/// Can be put into unions. /// Can be put into unions.
class DeclAccessPair { class DeclAccessPair {
NamedDecl *Ptr; // we'd use llvm::PointerUnion, but it isn't trivial uintptr_t Ptr; // we'd use llvm::PointerUnion, but it isn't trivial
enum { Mask = 0x3 }; enum { Mask = 0x3 };
@ -40,10 +40,10 @@ public:
} }
NamedDecl *getDecl() const { NamedDecl *getDecl() const {
return (NamedDecl*) (~Mask & (uintptr_t) Ptr); return reinterpret_cast<NamedDecl*>(~Mask & Ptr);
} }
AccessSpecifier getAccess() const { AccessSpecifier getAccess() const {
return AccessSpecifier(Mask & (uintptr_t) Ptr); return AccessSpecifier(Mask & Ptr);
} }
void setDecl(NamedDecl *D) { void setDecl(NamedDecl *D) {
@ -53,8 +53,7 @@ public:
set(getDecl(), AS); set(getDecl(), AS);
} }
void set(NamedDecl *D, AccessSpecifier AS) { void set(NamedDecl *D, AccessSpecifier AS) {
Ptr = reinterpret_cast<NamedDecl*>(uintptr_t(AS) | Ptr = uintptr_t(AS) | reinterpret_cast<uintptr_t>(D);
reinterpret_cast<uintptr_t>(D));
} }
operator NamedDecl*() const { return getDecl(); } operator NamedDecl*() const { return getDecl(); }