diff options
| author | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-09-26 00:40:45 +0000 |
|---|---|---|
| committer | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-09-26 00:40:45 +0000 |
| commit | 5b6c092b01e8365b3f02c5b27463153ae0a173e9 (patch) | |
| tree | 0ba0b0c1ef17a97f96d79403b865d826f0175d68 /src/common/string_conversion.cc | |
| parent | processor: add arm exception flags (diff) | |
| download | breakpad-5b6c092b01e8365b3f02c5b27463153ae0a173e9.tar.xz | |
Fix type in string_conversion.cc introduced in r1046
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1049 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/string_conversion.cc')
| -rw-r--r-- | src/common/string_conversion.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc index 5fa3496e..b4f4d77e 100644 --- a/src/common/string_conversion.cc +++ b/src/common/string_conversion.cc @@ -115,7 +115,7 @@ void UTF32ToUTF16Char(wchar_t in, u_int16_t out[2]) { } static inline u_int16_t Swap(u_int16_t value) { - return (value >> 8) | static_cast<uint16_t>(value << 8); + return (value >> 8) | static_cast<u_int16_t>(value << 8); } string UTF16ToUTF8(const vector<u_int16_t> &in, bool swap) { |