Make tests compile on Sun Studio.  Patch from Monty Taylor.
Make tests compile on Sun Studio.  Patch from Monty Taylor.

nilavghosh/Protocol-Buffers-Fork,nilavghosh/Protocol-Buffers-Fork,nilavghosh/Protocol-Buffers-Fork,nilavghosh/Protocol-Buffers-Fork,nilavghosh/Protocol-Buffers-Fork