From 2421d9a6e6e86ff3f37056a68454b7437fb60860 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Mon, 2 Jan 2017 16:15:07 -0500
Subject: Manual merging with dev

---
 binaryview.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'binaryview.cpp')

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());
-- 
cgit v1.3.1