From 5b6c092b01e8365b3f02c5b27463153ae0a173e9 Mon Sep 17 00:00:00 2001
From: "ted.mielczarek@gmail.com"
 <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Wed, 26 Sep 2012 00:40:45 +0000
Subject: 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
---
 src/common/string_conversion.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common/string_conversion.cc')

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) {
-- 
cgit v1.2.1