From c41f264a1dba68c89b4a224a70e3a5783f7fa879 Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Tue, 24 Jun 2025 17:55:48 -0400 Subject: Remove implicit conversions from Confidence to underlying type, these can cause bugs and also issues with C++20 --- type.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'type.cpp') diff --git a/type.cpp b/type.cpp index 4de8fc91..9dccede1 100644 --- a/type.cpp +++ b/type.cpp @@ -976,7 +976,7 @@ Ref Type::FunctionType(const Confidence>& returnValue, returnValueConf.confidence = returnValue.GetConfidence(); BNCallingConventionWithConfidence callingConventionConf; - callingConventionConf.convention = callingConvention ? callingConvention->GetObject() : nullptr; + callingConventionConf.convention = callingConvention.GetValue() ? callingConvention->GetObject() : nullptr; callingConventionConf.confidence = callingConvention.GetConfidence(); BNFunctionParameter* paramArray = new BNFunctionParameter[params.size()]; @@ -1036,7 +1036,7 @@ Ref Type::FunctionType(const Confidence>& returnValue, returnValueConf.confidence = returnValue.GetConfidence(); BNCallingConventionWithConfidence callingConventionConf; - callingConventionConf.convention = callingConvention ? callingConvention->GetObject() : nullptr; + callingConventionConf.convention = callingConvention.GetValue() ? callingConvention->GetObject() : nullptr; callingConventionConf.confidence = callingConvention.GetConfidence(); BNFunctionParameter* paramArray = new BNFunctionParameter[params.size()]; @@ -1981,7 +1981,7 @@ TypeBuilder TypeBuilder::FunctionType(const Confidence>& returnValue, returnValueConf.confidence = returnValue.GetConfidence(); BNCallingConventionWithConfidence callingConventionConf; - callingConventionConf.convention = callingConvention ? callingConvention->GetObject() : nullptr; + callingConventionConf.convention = callingConvention.GetValue() ? callingConvention->GetObject() : nullptr; callingConventionConf.confidence = callingConvention.GetConfidence(); size_t paramCount = 0; @@ -2032,7 +2032,7 @@ TypeBuilder TypeBuilder::FunctionType(const Confidence>& returnValue, returnValueConf.confidence = returnValue.GetConfidence(); BNCallingConventionWithConfidence callingConventionConf; - callingConventionConf.convention = callingConvention ? callingConvention->GetObject() : nullptr; + callingConventionConf.convention = callingConvention.GetValue() ? callingConvention->GetObject() : nullptr; callingConventionConf.confidence = callingConvention.GetConfidence(); BNFunctionParameter* paramArray = new BNFunctionParameter[params.size()]; -- cgit v1.3.1