Manual merging with dev

1 files changed, 7 insertions, 0 deletions

diff --git a/binaryview.cpp b/binaryview.cpp
index ff19de18..cc6667c5 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -1156,6 +1156,13 @@ void BinaryView::DefineAutoSymbol(Ref<Symbol> sym)
 }
 
 
+void BinaryView::DefineAutoSymbolAndVariableOrFunction(Ref<Platform> platform, Ref<Symbol> sym, Ref<Type> type)
+{
+	BNDefineAutoSymbolAndVariableOrFunction(m_object, platform ? platform->GetObject() : nullptr, sym->GetObject(),
+		type ? type->GetObject() : nullptr);
+}
+
+
 void BinaryView::UndefineAutoSymbol(Ref<Symbol> sym)
 {
 	BNUndefineAutoSymbol(m_object, sym->GetObject());