Skip to content

Commit a421e58

Browse files
plafosseplafosse
committed
Change NamedTypeReference.GetTypeClass to GetTypeReferenceClass as it was conflicting with Type.GetTypeClass
1 parent e7400c3 commit a421e58

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎binaryninjaapi.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2993,7 +2993,7 @@ __attribute__ ((format (printf, 1, 2)))
29932993
NamedTypeReference(BNNamedTypeReference* nt);
29942994
NamedTypeReference(BNNamedTypeReferenceClass cls = UnknownNamedTypeClass, const std::string& id = "",
29952995
const QualifiedName& name = QualifiedName());
2996-
BNNamedTypeReferenceClass GetTypeClass() const;
2996+
BNNamedTypeReferenceClass GetTypeReferenceClass() const;
29972997
std::string GetTypeId() const;
29982998
QualifiedName GetName() const;
29992999

@@ -3014,11 +3014,11 @@ __attribute__ ((format (printf, 1, 2)))
30143014
const QualifiedName& name = QualifiedName());
30153015
~NamedTypeReferenceBuilder();
30163016
BNNamedTypeReferenceBuilder* GetObject() { return m_object; };
3017-
BNNamedTypeReferenceClass GetTypeClass() const;
3017+
BNNamedTypeReferenceClass GetTypeReferenceClass() const;
30183018
std::string GetTypeId() const;
30193019
QualifiedName GetName() const;
30203020

3021-
void SetTypeClass(BNNamedTypeReferenceClass type);
3021+
void SetTypeReferenceClass(BNNamedTypeReferenceClass type);
30223022
void SetTypeId(const std::string& id);
30233023
void SetName(const QualifiedName& name);
30243024

‎python/generator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void OutputType(FILE* out, Type* type, bool isReturnType = false, bool isCallbac
9898
fprintf(out, "ctypes.c_double");
9999
break;
100100
case NamedTypeReferenceClass:
101-
if (type->GetNamedTypeReference()->GetTypeClass() == EnumNamedTypeClass)
101+
if (type->GetNamedTypeReference()->GetTypeReferenceClass() == EnumNamedTypeClass)
102102
{
103103
string name = type->GetNamedTypeReference()->GetName().GetString();
104104
if (name.size() > 2 && name.substr(0, 2) == "BN")

‎type.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ Confidence<Ref<Type>> Type::WithConfidence(uint8_t conf)
908908

909909
bool Type::IsReferenceOfType(BNNamedTypeReferenceClass refType)
910910
{
911-
return (GetClass() == NamedTypeReferenceClass) && (GetNamedTypeReference()->GetTypeClass() == refType);
911+
return (GetClass() == NamedTypeReferenceClass) && (GetNamedTypeReference()->GetTypeReferenceClass() == refType);
912912
}
913913

914914
QualifiedName Type::GetStructureName() const
@@ -1575,7 +1575,7 @@ NamedTypeReference::NamedTypeReference(BNNamedTypeReferenceClass cls, const stri
15751575
}
15761576

15771577

1578-
BNNamedTypeReferenceClass NamedTypeReference::GetTypeClass() const
1578+
BNNamedTypeReferenceClass NamedTypeReference::GetTypeReferenceClass() const
15791579
{
15801580
return BNGetTypeReferenceClass(m_object);
15811581
}
@@ -1644,7 +1644,7 @@ NamedTypeReferenceBuilder::~NamedTypeReferenceBuilder()
16441644
}
16451645

16461646

1647-
BNNamedTypeReferenceClass NamedTypeReferenceBuilder::GetTypeClass() const
1647+
BNNamedTypeReferenceClass NamedTypeReferenceBuilder::GetTypeReferenceClass() const
16481648
{
16491649
return BNGetTypeReferenceBuilderClass(m_object);
16501650
}
@@ -1668,7 +1668,7 @@ QualifiedName NamedTypeReferenceBuilder::GetName() const
16681668
}
16691669

16701670

1671-
void NamedTypeReferenceBuilder::SetTypeClass(BNNamedTypeReferenceClass type)
1671+
void NamedTypeReferenceBuilder::SetTypeReferenceClass(BNNamedTypeReferenceClass type)
16721672
{
16731673
BNSetNamedTypeReferenceBuilderTypeClass(m_object, type);
16741674
}

0 commit comments

Comments
 (0)