--- a/uiacceltk/hitchcock/Client/eabi/alfclientu.DEF Tue Jul 06 15:18:10 2010 +0300
+++ b/uiacceltk/hitchcock/Client/eabi/alfclientu.DEF Thu Jul 22 16:43:39 2010 +0100
@@ -1069,7 +1069,7 @@
_ZTI26CAlfAverageMappingFunction @ 1068 NONAME ; #<TI>#
_ZTI27CAlfConstantMappingFunction @ 1069 NONAME ; #<TI>#
_ZTI9CAlfBrush @ 1070 NONAME ; #<TI>#
- _ZTIN20CAlfCommandScheduler11CTimedEventE @ 1071 NONAME ; #<TI>#
+ _ZTIN20CAlfCommandScheduler11CTimedEventE @ 1071 NONAME ABSENT ; #<TI>#
_ZTV10CAlfLayout @ 1072 NONAME ; #<VT>#
_ZTV10CAlfVisual @ 1073 NONAME ; #<VT>#
_ZTV11CAlfControl @ 1074 NONAME ; #<VT>#
@@ -1108,7 +1108,7 @@
_ZTV26CAlfAverageMappingFunction @ 1107 NONAME ; #<VT>#
_ZTV27CAlfConstantMappingFunction @ 1108 NONAME ; #<VT>#
_ZTV9CAlfBrush @ 1109 NONAME ; #<VT>#
- _ZTVN20CAlfCommandScheduler11CTimedEventE @ 1110 NONAME ; #<VT>#
+ _ZTVN20CAlfCommandScheduler11CTimedEventE @ 1110 NONAME ABSENT ; #<VT>#
_ZThn32_N11CAlfControl11OfferEventLERK9TAlfEvent @ 1111 NONAME ; #<thunk>#
_ZThn40_NK19CAlfCurvePathLayout25MappingFunctionIdentifierEv @ 1112 NONAME ; #<thunk>#
_ZThn40_NK19CAlfCurvePathLayout8MapValueEfi @ 1113 NONAME ; #<thunk>#
--- a/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectParser.cpp Tue Jul 06 15:18:10 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiFxEffectParser.cpp Thu Jul 22 16:43:39 2010 +0100
@@ -729,7 +729,7 @@
TReal32 time = ParseFloatAttributeL(aNode, KLitAt);
TReal32 aux1 = ParseFloatAttributeL(aNode, KLitAux1, EFalse);
TReal32 aux2 = ParseFloatAttributeL(aNode, KLitAux2, EFalse);
- VALUE_TYPE value = ParseAnimationKeyFrameValueL<PARAM_TYPE::ValueType, TIMELINE_TYPE>(aNode->FirstChild(), aTimeLine);
+ VALUE_TYPE value = ParseAnimationKeyFrameValueL<typename PARAM_TYPE::ValueType, TIMELINE_TYPE>(aNode->FirstChild(), aTimeLine);
TRAPD(err, aTimeLine.AppendKeyFrameL(time, value, aux1, aux2));
if (err != KErrNone)
{
--- a/uiacceltk/hitchcock/coretoolkit/src/HuiGridLayout.cpp Tue Jul 06 15:18:10 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiGridLayout.cpp Thu Jul 22 16:43:39 2010 +0100
@@ -273,7 +273,8 @@
axis.iWeights.Reset();
for(TInt i = 0; i < aWeights.Count(); ++i)
{
- THuiMetric weight(TReal32(aWeights[i]), EHuiUnitWeight);
+ TInt weight_value(aWeights[i]); //evaluate this first and then use the value to initialize TReal (this fixes gcc 4.4.1 issue)
+ THuiMetric weight(TReal32(weight_value), EHuiUnitWeight);
User::LeaveIfError(axis.iWeights.Append(weight));
}
}
@@ -284,7 +285,8 @@
axis.iWeights.Reset();
for(TInt i = 0; i < aWeights.Count(); ++i)
{
- THuiMetric weight(TReal32(aWeights[i]), EHuiUnitWeight);
+ TInt weight_value(aWeights[i]); //evaluate this first and then use the value to initialize TReal (this fixes gcc 4.4.1 issue)
+ THuiMetric weight(TReal32(weight_value), EHuiUnitWeight);
User::LeaveIfError(axis.iWeights.Append(weight));
}
}
--- a/uiacceltk/hitchcock/goommonitor/inc/tracedefs.h Tue Jul 06 15:18:10 2010 +0300
+++ b/uiacceltk/hitchcock/goommonitor/inc/tracedefs.h Thu Jul 22 16:43:39 2010 +0100
@@ -34,6 +34,6 @@
/**
* Prefix macro for strings
*/
-#define _PREFIX_CHAR( aMsg ) (const char*)"[GOOM]: " ##aMsg
+#define _PREFIX_CHAR( aMsg ) (const char*)"[GOOM]: " #aMsg
#endif // TRACEDEFS_H