Merging with dev

1 files changed, 5 insertions, 5 deletions

diff --git a/type.cpp b/type.cpp
index 81d2ec26..37b8f131 100644
--- a/type.cpp
+++ b/type.cpp
@@ -604,10 +604,10 @@ uint64_t Type::GetOffset() const
 }
 
 
-Confidence<size_t> Type::GetStackAdjustment() const
+Confidence<int64_t> Type::GetStackAdjustment() const
 {
-	BNSizeWithConfidence result = BNGetTypeStackAdjustment(m_object);
-	return Confidence<size_t>(result.value, result.confidence);
+	BNOffsetWithConfidence result = BNGetTypeStackAdjustment(m_object);
+	return Confidence<int64_t>(result.value, result.confidence);
 }
 
 
@@ -823,7 +823,7 @@ Ref<Type> Type::ArrayType(const Confidence<Ref<Type>>& type, uint64_t elem)
 Ref<Type> Type::FunctionType(const Confidence<Ref<Type>>& returnValue,
 	const Confidence<Ref<CallingConvention>>& callingConvention,
 	const std::vector<FunctionParameter>& params, const Confidence<bool>& varArg,
-	const Confidence<size_t>& stackAdjust)
+	const Confidence<int64_t>& stackAdjust)
 {
 	BNTypeWithConfidence returnValueConf;
 	returnValueConf.type = returnValue->GetObject();
@@ -849,7 +849,7 @@ Ref<Type> Type::FunctionType(const Confidence<Ref<Type>>& returnValue,
 	varArgConf.value = varArg.GetValue();
 	varArgConf.confidence = varArg.GetConfidence();
 
-	BNSizeWithConfidence stackAdjustConf;
+	BNOffsetWithConfidence stackAdjustConf;
 	stackAdjustConf.value = stackAdjust.GetValue();
 	stackAdjustConf.confidence = stackAdjust.GetConfidence();