Fixes some compatibility issues with STLport.
Fixes some compatibility issues with STLport.


git-svn-id: f2be60d55979b34ac5db539df6b28881faa6b372@429 8415998a-534a-0410-bf83-d39667b30386

sensorflo/gmock,svn2github/chromium-gmock,open-eid/googlemock,bpsinc-native/src_testing_gmock,MrKepzie/google-mock,open-eid/googlemock,sensorflo/gmock,rtc-draper/googlemock,mydrive/gmock,cpp-mirrors/gmock,open-eid/googlemock,svn2github/googlemock,svn2github/googlemock,codingdojotw/gmock-mirror,codingdojotw/gmock-mirror,ttyangf/pdfium_gmock,openpeer/gmock,openpeer/gmock,Chilledheart/googlemock,evadeflow/gmock,rtc-draper/googlemock,svn2github/googlemock,yquant/gmock,cpp-mirrors/gmock,martinhansdk/googlemock,MrKepzie/google-mock,ttyangf/pdfium_gmock,yquant/gmock,evadeflow/gmock,martindam/googlemock,sensorflo/gmock,ttyangf/pdfium_gmock,okwasi/googlemock,openpeer/gmock,MrKepzie/google-mock,duanhjlt/gmock,okwasi/googlemock,svn2github/chromium-gmock,openpeer/gmock,istarc/googlemock,yquant/gmock,istarc/googlemock,guywithnose/android-googlemock,plexinc/googlemock,yquant/gmock,rtc-draper/googlemock,mydrive/gmock,plexinc/googlemock,svn2github/chromium-gmock,guywithnose/android-googlemock,duanhjlt/gmock,svn2github/chromium-gmock,Chilledheart/googlemock,martinhansdk/googlemock,guywithnose/android-googlemock,okwasi/googlemock,duanhjlt/gmock,martindam/googlemock,evadeflow/gmock,martindam/googlemock,bpsinc-native/src_testing_gmock,svn2github/googlemock,bpsinc-native/src_testing_gmock,martinhansdk/googlemock,cpp-mirrors/gmock,plexinc/googlemock,Chilledheart/googlemock,cpp-mirrors/gmock,codingdojotw/gmock-mirror,mydrive/gmock