Merge remote-tracking branch 'upstream/master'

hsivonen · hsivonen · commit f309a48e9307 · 2016-02-18T13:37:52.000+02:00
diff --git a/recode_cpp.cpp b/recode_cpp.cpp
@@ -128,7 +128,7 @@ convert_via_utf16(Decoder* decoder, Encoder* encoder, FILE* read, FILE* write,
                   bool last)
 {
   uint8_t input_buffer[INPUT_BUFFER_SIZE];
-  uint16_t intermediate_buffer[UTF16_INTERMEDIATE_BUFFER_SIZE];
+  char16_t intermediate_buffer[UTF16_INTERMEDIATE_BUFFER_SIZE];
   uint8_t output_buffer[OUTPUT_BUFFER_SIZE];
 
   bool current_input_ended = false;

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ convert_via_utf16(Decoder* decoder, Encoder* encoder, FILE* read, FILE* write,`
`128`	`128`	`bool last)`
`129`	`129`	`{`
`130`	`130`	`uint8_t input_buffer[INPUT_BUFFER_SIZE];`
`131`		`- uint16_t intermediate_buffer[UTF16_INTERMEDIATE_BUFFER_SIZE];`
	`131`	`+ char16_t intermediate_buffer[UTF16_INTERMEDIATE_BUFFER_SIZE];`
`132`	`132`	`uint8_t output_buffer[OUTPUT_BUFFER_SIZE];`
`133`	`133`
`134`	`134`	`bool current_input_ended = false;`