CPP: Fix build issue

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@727 ee073f10-1060-11df-b6a4-87a95322a99c
Merge branch 'master' into rpmbuild