Merge pull request #14 from maximusron/overload-dev

move isIntegralType to end of QualType OpaquePtr interface
wlav · Sep 5, 2023 · c24e4b9 · c24e4b9
2 parents 9c07abd + 04741ec
commit c24e4b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cling/src/core/meta/inc/TInterpreter.h b/cling/src/core/meta/inc/TInterpreter.h
@@ -473,16 +473,18 @@ class TInterpreter : public TNamed {
    virtual Bool_t IsIntegerType(const void * /* QualTypePtr */) const {return 0;}
    virtual Bool_t IsSignedIntegerType(const void * /* QualTypePtr */) const {return 0;}
    virtual Bool_t IsUnsignedIntegerType(const void * /* QualTypePtr */) const {return 0;}
-   virtual Bool_t IsIntegralType(const void * /* QualTypePtr */) const {return 0;}
    virtual Bool_t IsFloatingType(const void * /* QualTypePtr */) const {return 0;}
    virtual Bool_t IsPointerType(const void * /* QualTypePtr */) const {return 0;}
    virtual Bool_t IsVoidPointerType(const void * /* QualTypePtr */) const {return 0;}
-   virtual TypeInfo_t *GetNonReferenceType(const void * /* QualTypePtr */) const {return 0;}
-   virtual TypeInfo_t *GetUnqualifiedType(const void * /* QualTypePtr */) const {return 0;}
-   virtual TypeInfo_t *GetPointerType(const void * /* QualTypePtr */) const {return 0;}
 
 // FunctionDecl interface 
    virtual Bool_t FunctionDeclId_IsMethod(DeclId_t /* fdeclid */) const {return 0;}
+
+// additional QualType Opaque Ptr interface
+   virtual Bool_t IsIntegralType(const void * /* QualTypePtr */) const {return 0;}
+   virtual TypeInfo_t *GetNonReferenceType(const void * /* QualTypePtr */) const {return 0;}
+   virtual TypeInfo_t *GetUnqualifiedType(const void * /* QualTypePtr */) const {return 0;}
+   virtual TypeInfo_t *GetPointerType(const void * /* QualTypePtr */) const {return 0;}
 };
 
 } // namespace CppyyLegacy

diff --git a/cling/src/core/metacling/src/TCling.h b/cling/src/core/metacling/src/TCling.h
@@ -591,14 +591,15 @@ class TCling final : public TInterpreter {
    virtual bool IsIntegerType(const void * QualTypePtr) const;
    virtual bool IsSignedIntegerType(const void * QualTypePtr) const;
    virtual bool IsUnsignedIntegerType(const void * QualTypePtr) const;
-   virtual bool IsIntegralType(const void * QualTypePtr) const;
    virtual bool IsFloatingType(const void * QualTypePtr) const;
    virtual bool IsPointerType(const void * QualTypePtr) const;
    virtual bool IsVoidPointerType(const void * QualTypePtr) const;
 
 // FunctionDecl interface 
    bool FunctionDeclId_IsMethod(DeclId_t fdeclid) const;
 
+// additional QualType Opaque Ptr interface
+   virtual bool IsIntegralType(const void * QualTypePtr) const;
    virtual TypeInfo_t* GetNonReferenceType(const void * QualTypePtr) const;
    virtual TypeInfo_t* GetUnqualifiedType(const void * QualTypePtr) const;
    virtual TypeInfo_t* GetPointerType(const void * QualTypePtr) const;