From 37c82bbcff7e765cb82e9984b8355afdabc3d78f Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Fri, 1 Apr 2016 15:08:02 -0500 Subject: Change return type for platGetFusedCoreMode A change to the size of ReturnCode::iv_rc exposed a type mismatch in ATTR_FUSED_CORE_MODE_GETMACRO that was previously hidden due to favorable cast operators. Change-Id: Ie34bf0e163039c0adf461b2fa4d83f5e3e328d8f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22808 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Reviewed-by: Richard J. Knight Reviewed-by: Daniel M. Crowell --- src/include/usr/fapi2/attribute_service.H | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/usr/fapi2') diff --git a/src/include/usr/fapi2/attribute_service.H b/src/include/usr/fapi2/attribute_service.H index 5716d38a8..7e7cecfcb 100644 --- a/src/include/usr/fapi2/attribute_service.H +++ b/src/include/usr/fapi2/attribute_service.H @@ -242,7 +242,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL)) //------------------------------------------------------------------------------ #define ATTR_NAME_GETMACRO(ID, PTARGET, VAL) \ AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\ - ? fapi2::FAPI2_RC_SUCCESS : \ + ? fapi2::ReturnCode() : \ fapi2::platAttrSvc::platGetTargetName(PTARGET, VAL) //------------------------------------------------------------------------------ @@ -250,7 +250,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL)) //------------------------------------------------------------------------------ #define ATTR_FUNCTIONAL_GETMACRO(ID, PTARGET, VAL) \ AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\ - ? fapi2::FAPI2_RC_SUCCESS : \ + ? fapi2::ReturnCode() : \ fapi2::platAttrSvc::platGetFunctional(PTARGET, VAL) //------------------------------------------------------------------------------ @@ -258,7 +258,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL)) //------------------------------------------------------------------------------ #define ATTR_POS_GETMACRO(ID, PTARGET, VAL) \ AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\ - ? fapi2::FAPI2_RC_SUCCESS : \ + ? fapi2::ReturnCode() : \ fapi2::platAttrSvc::platGetTargetPos(PTARGET, VAL) //------------------------------------------------------------------------------ @@ -266,7 +266,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL)) //------------------------------------------------------------------------------ #define ATTR_FUSED_CORE_MODE_GETMACRO(ID, PTARGET, VAL) \ AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\ - ? fapi2::FAPI2_RC_SUCCESS : \ + ? fapi2::ReturnCode() : \ fapi2::platAttrSvc::platGetFusedCoreMode(VAL) #endif // ATTRIBUTESERVICE_H_ -- cgit v1.2.3