| Index: courgette/ensemble_apply.cc
|
| ===================================================================
|
| --- courgette/ensemble_apply.cc (revision 21002)
|
| +++ courgette/ensemble_apply.cc (working copy)
|
| @@ -351,9 +351,9 @@
|
| return C_OK;
|
| }
|
|
|
| -Status ApplyEnsemblePatch(const wchar_t* old_file_name,
|
| - const wchar_t* patch_file_name,
|
| - const wchar_t* new_file_name) {
|
| +Status ApplyEnsemblePatch(const FilePath::CharType* old_file_name,
|
| + const FilePath::CharType* patch_file_name,
|
| + const FilePath::CharType* new_file_name) {
|
| Status status;
|
|
|
| // First read enough of the patch file to validate the header is well-formed.
|
| @@ -403,7 +403,7 @@
|
| new_sink_stream.Length());
|
| if (written == -1)
|
| return C_WRITE_OPEN_ERROR;
|
| - if (written != new_sink_stream.Length())
|
| + if (static_cast<size_t>(written) != new_sink_stream.Length())
|
| return C_WRITE_ERROR;
|
|
|
| return C_OK;
|
|
|
| Property changes on: courgette/ensemble_apply.cc
|
| ___________________________________________________________________
|
| Name: svn:eol-style
|
| + LF
|
|
|
|
|