diff -r bf7481649c98 -r 7f25ef56562d fbs/fontandbitmapserver/sfbs/FBSCLI.CPP --- a/fbs/fontandbitmapserver/sfbs/FBSCLI.CPP Fri Jun 11 14:58:47 2010 +0300 +++ b/fbs/fontandbitmapserver/sfbs/FBSCLI.CPP Wed Jun 23 19:41:15 2010 +0300 @@ -35,7 +35,7 @@ { if (aAny && aHeapBase) { - return (TInt)aAny - (TInt)aHeapBase; + return reinterpret_cast(aAny) - aHeapBase; } return 0; } @@ -47,11 +47,11 @@ @return A pointer relative to the passed heap base. @see PointerToOffset() */ -LOCAL_C TAny* OffsetToPointer(const TInt aOffset, TInt aHeapBase) +LOCAL_C TAny* OffsetToPointer(TInt aOffset, TInt aHeapBase) { if (aOffset && aHeapBase) { - return (TAny*)(aOffset + (TInt)aHeapBase); + return reinterpret_cast(aOffset + aHeapBase); } return NULL; }