diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-08 19:24:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-08 19:24:46 +0000 |
commit | 3eec52e2f37fb5ad2e6de4ec20cb26ff280777a1 (patch) | |
tree | 206a748c51d12870ca8426c9d7a59a11639d87b2 /Build/source/libs/icu/icu-src/source/io | |
parent | 730f4601e0de27c5eccd405e393f80425fa6cdf2 (diff) |
icu 63.1
git-svn-id: svn://tug.org/texlive/trunk@49641 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/io')
4 files changed, 12 insertions, 11 deletions
diff --git a/Build/source/libs/icu/icu-src/source/io/io.vcxproj b/Build/source/libs/icu/icu-src/source/io/io.vcxproj index ac7d6f656ec..7e7b5cd9b8a 100644 --- a/Build/source/libs/icu/icu-src/source/io/io.vcxproj +++ b/Build/source/libs/icu/icu-src/source/io/io.vcxproj @@ -2,7 +2,8 @@ <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- The following import will include the 'default' configuration options for VS projects. --> <Import Project="..\allinone\Build.Windows.ProjectConfiguration.props" /> - + <!-- The following import will include the library configuration options for VS projects. --> + <Import Project="..\allinone\Build.Windows.Library.ProjectConfiguration.props" /> <PropertyGroup Label="Globals"> <ProjectGuid>{C2B04507-2521-4801-BF0D-5FD79D6D518C}</ProjectGuid> </PropertyGroup> @@ -76,7 +77,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin\icuio61.dll</OutputFile> + <OutputFile>..\..\bin\icuio63.dll</OutputFile> <AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile> @@ -101,7 +102,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin\icuio61d.dll</OutputFile> + <OutputFile>..\..\bin\icuio63d.dll</OutputFile> <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -126,7 +127,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin64\icuio61.dll</OutputFile> + <OutputFile>..\..\bin64\icuio63.dll</OutputFile> <AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile> @@ -148,7 +149,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin64\icuio61d.dll</OutputFile> + <OutputFile>..\..\bin64\icuio63d.dll</OutputFile> <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -190,4 +191,4 @@ <Import Project="$(SolutionDir)\Windows.CopyUnicodeHeaderFiles.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp index 2b1a76fc8a2..0b6c18ff966 100644 --- a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp +++ b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp @@ -140,7 +140,7 @@ ufmt_uto64(const UChar *buffer, { const UChar *limit; int32_t count; - int64_t result; + uint64_t result; /* intialize parameters */ @@ -160,7 +160,7 @@ ufmt_uto64(const UChar *buffer, } *len = count; - return result; + return static_cast<int64_t>(result); } #define NIBBLE_PER_BYTE 2 @@ -235,7 +235,7 @@ ufmt_defaultCPToUnicode(const char *s, int32_t sSize, return 0; if(sSize <= 0) { - sSize = uprv_strlen(s) + 1; + sSize = static_cast<int32_t>(uprv_strlen(s)) + 1; } /* perform the conversion in one swoop */ diff --git a/Build/source/libs/icu/icu-src/source/io/uprintf.cpp b/Build/source/libs/icu/icu-src/source/io/uprintf.cpp index d433707ded9..3c9effaadaf 100644 --- a/Build/source/libs/icu/icu-src/source/io/uprintf.cpp +++ b/Build/source/libs/icu/icu-src/source/io/uprintf.cpp @@ -183,7 +183,7 @@ u_vfprintf( UFILE *f, else { pattern = buffer; } - u_charsToUChars(patternSpecification, pattern, size); + u_charsToUChars(patternSpecification, pattern, static_cast<int32_t>(size)); /* do the work */ count = u_vfprintf_u(f, pattern, ap); diff --git a/Build/source/libs/icu/icu-src/source/io/ustream.cpp b/Build/source/libs/icu/icu-src/source/io/ustream.cpp index 948521a7fef..51676ea0f54 100644 --- a/Build/source/libs/icu/icu-src/source/io/ustream.cpp +++ b/Build/source/libs/icu/icu-src/source/io/ustream.cpp @@ -123,7 +123,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str) /* Was the character consumed? */ if (us != uBuffer) { /* Reminder: ibm-1390 & JISX0213 can output 2 Unicode code points */ - int32_t uBuffSize = us-uBuffer; + int32_t uBuffSize = static_cast<int32_t>(us-uBuffer); int32_t uBuffIdx = 0; while (uBuffIdx < uBuffSize) { U16_NEXT(uBuffer, uBuffIdx, uBuffSize, ch32); |