Author: dblaikie Date: Wed Aug 9 11:34:22 2017 New Revision: 310508 URL: http://llvm.org/viewvc/llvm-project?rev=310508&view=rev Log: PointerLikeTypeTraits: class->struct to match LLVM change
Modified: cfe/trunk/include/clang/AST/CanonicalType.h cfe/trunk/include/clang/AST/DeclCXX.h cfe/trunk/include/clang/AST/DeclGroup.h cfe/trunk/include/clang/AST/TemplateName.h cfe/trunk/include/clang/AST/Type.h cfe/trunk/include/clang/Basic/IdentifierTable.h cfe/trunk/include/clang/Basic/SourceLocation.h cfe/trunk/include/clang/CodeGen/ConstantInitFuture.h cfe/trunk/include/clang/Sema/Ownership.h Modified: cfe/trunk/include/clang/AST/CanonicalType.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/CanonicalType.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/CanonicalType.h (original) +++ cfe/trunk/include/clang/AST/CanonicalType.h Wed Aug 9 11:34:22 2017 @@ -359,8 +359,7 @@ struct simplify_type< ::clang::CanQual<T // Teach SmallPtrSet that CanQual<T> is "basically a pointer". template<typename T> -class PointerLikeTypeTraits<clang::CanQual<T> > { -public: +struct PointerLikeTypeTraits<clang::CanQual<T> > { static inline void *getAsVoidPointer(clang::CanQual<T> P) { return P.getAsOpaquePtr(); } Modified: cfe/trunk/include/clang/AST/DeclCXX.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/DeclCXX.h (original) +++ cfe/trunk/include/clang/AST/DeclCXX.h Wed Aug 9 11:34:22 2017 @@ -73,8 +73,7 @@ public: namespace llvm { // Provide PointerLikeTypeTraits for non-cvr pointers. template<> - class PointerLikeTypeTraits< ::clang::AnyFunctionDecl> { - public: + struct PointerLikeTypeTraits< ::clang::AnyFunctionDecl> { static inline void *getAsVoidPointer(::clang::AnyFunctionDecl F) { return F.get(); } Modified: cfe/trunk/include/clang/AST/DeclGroup.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclGroup.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/DeclGroup.h (original) +++ cfe/trunk/include/clang/AST/DeclGroup.h Wed Aug 9 11:34:22 2017 @@ -138,10 +138,9 @@ public: namespace llvm { // DeclGroupRef is "like a pointer", implement PointerLikeTypeTraits. template <typename T> - class PointerLikeTypeTraits; + struct PointerLikeTypeTraits; template <> - class PointerLikeTypeTraits<clang::DeclGroupRef> { - public: + struct PointerLikeTypeTraits<clang::DeclGroupRef> { static inline void *getAsVoidPointer(clang::DeclGroupRef P) { return P.getAsOpaquePtr(); } Modified: cfe/trunk/include/clang/AST/TemplateName.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/TemplateName.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/TemplateName.h (original) +++ cfe/trunk/include/clang/AST/TemplateName.h Wed Aug 9 11:34:22 2017 @@ -515,8 +515,7 @@ namespace llvm { /// \brief The clang::TemplateName class is effectively a pointer. template<> -class PointerLikeTypeTraits<clang::TemplateName> { -public: +struct PointerLikeTypeTraits<clang::TemplateName> { static inline void *getAsVoidPointer(clang::TemplateName TN) { return TN.getAsVoidPointer(); } Modified: cfe/trunk/include/clang/AST/Type.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Type.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/AST/Type.h (original) +++ cfe/trunk/include/clang/AST/Type.h Wed Aug 9 11:34:22 2017 @@ -48,10 +48,9 @@ namespace clang { namespace llvm { template <typename T> - class PointerLikeTypeTraits; + struct PointerLikeTypeTraits; template<> - class PointerLikeTypeTraits< ::clang::Type*> { - public: + struct PointerLikeTypeTraits< ::clang::Type*> { static inline void *getAsVoidPointer(::clang::Type *P) { return P; } static inline ::clang::Type *getFromVoidPointer(void *P) { return static_cast< ::clang::Type*>(P); @@ -59,8 +58,7 @@ namespace llvm { enum { NumLowBitsAvailable = clang::TypeAlignmentInBits }; }; template<> - class PointerLikeTypeTraits< ::clang::ExtQuals*> { - public: + struct PointerLikeTypeTraits< ::clang::ExtQuals*> { static inline void *getAsVoidPointer(::clang::ExtQuals *P) { return P; } static inline ::clang::ExtQuals *getFromVoidPointer(void *P) { return static_cast< ::clang::ExtQuals*>(P); @@ -1143,8 +1141,7 @@ template<> struct simplify_type< ::clang // Teach SmallPtrSet that QualType is "basically a pointer". template<> -class PointerLikeTypeTraits<clang::QualType> { -public: +struct PointerLikeTypeTraits<clang::QualType> { static inline void *getAsVoidPointer(clang::QualType P) { return P.getAsOpaquePtr(); } Modified: cfe/trunk/include/clang/Basic/IdentifierTable.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/IdentifierTable.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/IdentifierTable.h (original) +++ cfe/trunk/include/clang/Basic/IdentifierTable.h Wed Aug 9 11:34:22 2017 @@ -874,11 +874,10 @@ struct DenseMapInfo<clang::Selector> { template <> struct isPodLike<clang::Selector> { static const bool value = true; }; -template <typename T> class PointerLikeTypeTraits; +template <typename T> struct PointerLikeTypeTraits; template<> -class PointerLikeTypeTraits<clang::Selector> { -public: +struct PointerLikeTypeTraits<clang::Selector> { static inline const void *getAsVoidPointer(clang::Selector P) { return P.getAsOpaquePtr(); } @@ -893,8 +892,7 @@ public: // Provide PointerLikeTypeTraits for IdentifierInfo pointers, which // are not guaranteed to be 8-byte aligned. template<> -class PointerLikeTypeTraits<clang::IdentifierInfo*> { -public: +struct PointerLikeTypeTraits<clang::IdentifierInfo*> { static inline void *getAsVoidPointer(clang::IdentifierInfo* P) { return P; } @@ -907,8 +905,7 @@ public: }; template<> -class PointerLikeTypeTraits<const clang::IdentifierInfo*> { -public: +struct PointerLikeTypeTraits<const clang::IdentifierInfo*> { static inline const void *getAsVoidPointer(const clang::IdentifierInfo* P) { return P; } Modified: cfe/trunk/include/clang/Basic/SourceLocation.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceLocation.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/SourceLocation.h (original) +++ cfe/trunk/include/clang/Basic/SourceLocation.h Wed Aug 9 11:34:22 2017 @@ -455,8 +455,7 @@ namespace llvm { // Teach SmallPtrSet how to handle SourceLocation. template<> - class PointerLikeTypeTraits<clang::SourceLocation> { - public: + struct PointerLikeTypeTraits<clang::SourceLocation> { static inline void *getAsVoidPointer(clang::SourceLocation L) { return L.getPtrEncoding(); } Modified: cfe/trunk/include/clang/CodeGen/ConstantInitFuture.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CodeGen/ConstantInitFuture.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/CodeGen/ConstantInitFuture.h (original) +++ cfe/trunk/include/clang/CodeGen/ConstantInitFuture.h Wed Aug 9 11:34:22 2017 @@ -31,8 +31,7 @@ class ConstantInitBuilderBase; } namespace llvm { template <> -class PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitBuilderBase*> { -public: +struct PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitBuilderBase*> { using T = ::clang::CodeGen::ConstantInitBuilderBase*; static inline void *getAsVoidPointer(T p) { return p; } @@ -93,8 +92,7 @@ public: namespace llvm { template <> -class PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitFuture> { -public: +struct PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitFuture> { using T = ::clang::CodeGen::ConstantInitFuture; static inline void *getAsVoidPointer(T future) { Modified: cfe/trunk/include/clang/Sema/Ownership.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Ownership.h?rev=310508&r1=310507&r2=310508&view=diff ============================================================================== --- cfe/trunk/include/clang/Sema/Ownership.h (original) +++ cfe/trunk/include/clang/Sema/Ownership.h Wed Aug 9 11:34:22 2017 @@ -107,8 +107,7 @@ namespace clang { namespace llvm { template <class T> - class PointerLikeTypeTraits<clang::OpaquePtr<T> > { - public: + struct PointerLikeTypeTraits<clang::OpaquePtr<T> > { static inline void *getAsVoidPointer(clang::OpaquePtr<T> P) { // FIXME: Doesn't work? return P.getAs< void >(); return P.getAsOpaquePtr(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits