apicompatanamdw/compatanalysercmd/headeranalyser/src/BBCAnalyser.cpp
changeset 12 a0eee409ff14
parent 3 ebe3f8f03b59
--- a/apicompatanamdw/compatanalysercmd/headeranalyser/src/BBCAnalyser.cpp	Mon Sep 20 10:04:46 2010 +0100
+++ b/apicompatanamdw/compatanalysercmd/headeranalyser/src/BBCAnalyser.cpp	Mon Sep 27 14:51:17 2010 +0530
@@ -2093,9 +2093,11 @@
 		if(Equals(baseMathodID,KXMLMethodString))
 		{
 			basenameatt = basemethod.GetAttribute(KXMLNameString);
+			
 			HANodeIterator baseReturMathod(basemethod);
 			bool ret = baseReturMathod.FindNodeById(basemethod.GetAttribute(KXMLReturnsString));
-			basereturnatt = baseReturMathod.GetAttribute(KXMLNameString);
+			basereturnatt = GetActualTypeValue(baseReturMathod);
+			
 			basemangledatt = basemethod.GetAttribute(KXMLMangledString);
 		}
 		for( ; cIter != cexportedMethods.end(); ++cIter)            
@@ -2121,7 +2123,7 @@
 			{
 				HANodeIterator curReturMathod(currentmethod);
 				bool ret1 = curReturMathod.FindNodeById(currentmethod.GetAttribute(KXMLReturnsString));
-				const XMLCh* curReturnatt = curReturMathod.GetAttribute(KXMLNameString); 
+				const XMLCh* curReturnatt = GetActualTypeValue(curReturMathod);
 
 				// check for overloaded function, first time matching the name, return type and signature
 				if(	Equals(baseMathodID,KXMLMethodString)&&
@@ -2307,7 +2309,7 @@
 				{
 					HANodeIterator curReturMathod(currentmethod);
 					bool ret1 = curReturMathod.FindNodeById(currentmethod.GetAttribute(KXMLReturnsString));
-					const XMLCh* curReturnatt = curReturMathod.GetAttribute(KXMLNameString); 
+				    const XMLCh* curReturnatt = GetActualTypeValue(curReturMathod);
 
 					const XMLCh* lineNumber1 = GetAttribute(currentmethod.current,KXMLLineString);
 			        lineNo = atoi(toString(lineNumber1).c_str());
@@ -2315,7 +2317,7 @@
 					if(fnameNode != NULL)
 					{
 						HANodeIterator filenode1(currentmethod); 
-						ret1 = filenode1.FindNodeById(fnameNode);
+						bool ret1 = filenode1.FindNodeById(fnameNode);
 						fileName = toString(filenode1.GetAttribute(KXMLNameString));
 					}
 
@@ -2343,7 +2345,7 @@
 					{
 						HANodeIterator returMathod(bmethod);
 						bool ret1 = returMathod.FindNodeById(bmethod.GetAttribute(KXMLReturnsString));
-						const XMLCh* returnatt = returMathod.GetAttribute(KXMLNameString); 
+						const XMLCh* returnatt = GetActualTypeValue(returMathod);
 
 						if(Equals(basenameatt, bmethod.GetAttribute(KXMLNameString)) && 
 							Equals(basereturnatt, returnatt) &&