summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/icu-src/source/io
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-12 18:35:28 +0000
committerKarl Berry <karl@freefriends.org>2018-01-12 18:35:28 +0000
commit39cc3fec95f3782316910590bb86993918c9dcdf (patch)
tree2315d3b06410f34b2cfd5c73ba6cc53610752030 /Build/source/libs/icu/icu-src/source/io
parent424a61bc1ceab7381e71b1535c7639f61d2645ba (diff)
icu-60.2
git-svn-id: svn://tug.org/texlive/trunk@46290 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/io')
-rw-r--r--Build/source/libs/icu/icu-src/source/io/Makefile.in2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/io.vcxproj31
-rw-r--r--Build/source/libs/icu/icu-src/source/io/io.vcxproj.filters16
-rw-r--r--Build/source/libs/icu/icu-src/source/io/locbund.cpp2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/locbund.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/sprintf.cpp (renamed from Build/source/libs/icu/icu-src/source/io/sprintf.c)2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/sscanf.cpp (renamed from Build/source/libs/icu/icu-src/source/io/sscanf.c)2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ucln_io.cpp4
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ucln_io.h4
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ufile.cpp (renamed from Build/source/libs/icu/icu-src/source/io/ufile.c)51
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ufile.h4
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp (renamed from Build/source/libs/icu/icu-src/source/io/ufmt_cmn.c)4
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ufmt_cmn.h4
-rw-r--r--Build/source/libs/icu/icu-src/source/io/unicode/ustdio.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/unicode/ustream.h11
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uprintf.cpp2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uprintf.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uprntf_p.cpp (renamed from Build/source/libs/icu/icu-src/source/io/uprntf_p.c)17
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uscanf.cpp (renamed from Build/source/libs/icu/icu-src/source/io/uscanf.c)2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uscanf.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp (renamed from Build/source/libs/icu/icu-src/source/io/uscanf_p.c)44
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ustdio.cpp (renamed from Build/source/libs/icu/icu-src/source/io/ustdio.c)2
-rw-r--r--Build/source/libs/icu/icu-src/source/io/ustream.cpp5
23 files changed, 125 insertions, 92 deletions
diff --git a/Build/source/libs/icu/icu-src/source/io/Makefile.in b/Build/source/libs/icu/icu-src/source/io/Makefile.in
index 84843254334..45dbe870fb3 100644
--- a/Build/source/libs/icu/icu-src/source/io/Makefile.in
+++ b/Build/source/libs/icu/icu-src/source/io/Makefile.in
@@ -55,7 +55,7 @@ DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
CFLAGS += $(LIBCFLAGS)
CXXFLAGS += $(LIBCXXFLAGS)
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) $(CPPFLAGSICUIO)
+CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) $(CPPFLAGSICUIO)
DEFS += -DU_IO_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUIO)
LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS)
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 3173e920809..375b716c9ac 100644
--- a/Build/source/libs/icu/icu-src/source/io/io.vcxproj
+++ b/Build/source/libs/icu/icu-src/source/io/io.vcxproj
@@ -20,6 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C2B04507-2521-4801-BF0D-5FD79D6D518C}</ProjectGuid>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -104,6 +105,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -111,7 +113,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuio58.dll</OutputFile>
+ <OutputFile>..\..\bin\icuio60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -148,6 +150,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -155,7 +158,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin\icuio58d.dll</OutputFile>
+ <OutputFile>..\..\bin\icuio60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile>
@@ -189,6 +192,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -196,7 +200,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuio58.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuio60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -231,6 +235,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -238,7 +243,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <OutputFile>..\..\bin64\icuio58d.dll</OutputFile>
+ <OutputFile>..\..\bin64\icuio60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile>
@@ -249,18 +254,18 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="locbund.cpp" />
- <ClCompile Include="sprintf.c" />
- <ClCompile Include="sscanf.c" />
+ <ClCompile Include="sprintf.cpp" />
+ <ClCompile Include="sscanf.cpp" />
<ClCompile Include="ucln_io.cpp">
<DisableLanguageExtensions>false</DisableLanguageExtensions>
</ClCompile>
- <ClCompile Include="ufile.c" />
- <ClCompile Include="ufmt_cmn.c" />
+ <ClCompile Include="ufile.cpp" />
+ <ClCompile Include="ufmt_cmn.cpp" />
<ClCompile Include="uprintf.cpp" />
- <ClCompile Include="uprntf_p.c" />
- <ClCompile Include="uscanf.c" />
- <ClCompile Include="uscanf_p.c" />
- <ClCompile Include="ustdio.c" />
+ <ClCompile Include="uprntf_p.cpp" />
+ <ClCompile Include="uscanf.cpp" />
+ <ClCompile Include="uscanf_p.cpp" />
+ <ClCompile Include="ustdio.cpp" />
<ClCompile Include="ustream.cpp">
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</DisableLanguageExtensions>
<DisableLanguageExtensions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</DisableLanguageExtensions>
@@ -320,4 +325,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project> \ No newline at end of file
+</Project>
diff --git a/Build/source/libs/icu/icu-src/source/io/io.vcxproj.filters b/Build/source/libs/icu/icu-src/source/io/io.vcxproj.filters
index 61252bff3a0..4a6841ba286 100644
--- a/Build/source/libs/icu/icu-src/source/io/io.vcxproj.filters
+++ b/Build/source/libs/icu/icu-src/source/io/io.vcxproj.filters
@@ -18,34 +18,34 @@
<ClCompile Include="locbund.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sprintf.c">
+ <ClCompile Include="sprintf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sscanf.c">
+ <ClCompile Include="sscanf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ucln_io.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ufile.c">
+ <ClCompile Include="ufile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ufmt_cmn.c">
+ <ClCompile Include="ufmt_cmn.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="uprintf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="uprntf_p.c">
+ <ClCompile Include="uprntf_p.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="uscanf.c">
+ <ClCompile Include="uscanf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="uscanf_p.c">
+ <ClCompile Include="uscanf_p.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ustdio.c">
+ <ClCompile Include="ustdio.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ustream.cpp">
diff --git a/Build/source/libs/icu/icu-src/source/io/locbund.cpp b/Build/source/libs/icu/icu-src/source/io/locbund.cpp
index 298452859f7..8e880b17cf2 100644
--- a/Build/source/libs/icu/icu-src/source/io/locbund.cpp
+++ b/Build/source/libs/icu/icu-src/source/io/locbund.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/locbund.h b/Build/source/libs/icu/icu-src/source/io/locbund.h
index b9e19484b65..5879e28f015 100644
--- a/Build/source/libs/icu/icu-src/source/io/locbund.h
+++ b/Build/source/libs/icu/icu-src/source/io/locbund.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/sprintf.c b/Build/source/libs/icu/icu-src/source/io/sprintf.cpp
index ff143deb288..3a593abb480 100644
--- a/Build/source/libs/icu/icu-src/source/io/sprintf.c
+++ b/Build/source/libs/icu/icu-src/source/io/sprintf.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/sscanf.c b/Build/source/libs/icu/icu-src/source/io/sscanf.cpp
index 31ad8965fc2..47c0bace27e 100644
--- a/Build/source/libs/icu/icu-src/source/io/sscanf.c
+++ b/Build/source/libs/icu/icu-src/source/io/sscanf.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp b/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp
index 21a0baf58db..7a7216b7543 100644
--- a/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp
+++ b/Build/source/libs/icu/icu-src/source/io/ucln_io.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -8,7 +8,7 @@
* *
******************************************************************************
* file name: ucln_io.cpp
-* encoding: US-ASCII
+* encoding: UTF-8
* tab size: 8 (not used)
* indentation:4
*
diff --git a/Build/source/libs/icu/icu-src/source/io/ucln_io.h b/Build/source/libs/icu/icu-src/source/io/ucln_io.h
index 97d06a12ffd..20dcb88ac74 100644
--- a/Build/source/libs/icu/icu-src/source/io/ucln_io.h
+++ b/Build/source/libs/icu/icu-src/source/io/ucln_io.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -8,7 +8,7 @@
* *
******************************************************************************
* file name: ucln_io.h
-* encoding: US-ASCII
+* encoding: UTF-8
* tab size: 8 (not used)
* indentation:4
*
diff --git a/Build/source/libs/icu/icu-src/source/io/ufile.c b/Build/source/libs/icu/icu-src/source/io/ufile.cpp
index 87ed3f1e969..1d8c221cdcb 100644
--- a/Build/source/libs/icu/icu-src/source/io/ufile.c
+++ b/Build/source/libs/icu/icu-src/source/io/ufile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -8,7 +8,7 @@
*
******************************************************************************
*
-* File ufile.c
+* File ufile.cpp
*
* Modification History:
*
@@ -20,10 +20,11 @@
******************************************************************************
*/
-/*
- * fileno is not declared when building with GCC in strict mode.
- */
-#if defined(__GNUC__) && defined(__STRICT_ANSI__)
+#include "unicode/platform.h"
+#if defined(__GNUC__) && !defined(__clang__) && defined(__STRICT_ANSI__)
+// g++, fileno isn't defined if __STRICT_ANSI__ is defined.
+// clang fails to compile the <string> header unless __STRICT_ANSI__ is defined.
+// __GNUC__ is set by both gcc and clang.
#undef __STRICT_ANSI__
#endif
@@ -32,6 +33,8 @@
#if !UCONFIG_NO_CONVERSION
+#include <stdlib.h>
+
#include "ufile.h"
#include "unicode/uloc.h"
#include "unicode/ures.h"
@@ -64,33 +67,7 @@ finit_owner(FILE *f,
uprv_memset(result, 0, sizeof(UFILE));
result->fFileno = fileno(f);
-
-#if U_PLATFORM_USES_ONLY_WIN32_API && _MSC_VER < 1900
- /*
- * Below is a very old workaround (ICU ticket:231).
- *
- * Previously, 'FILE*' from inside and outside ICU's DLL
- * were different, because they pointed into local copies
- * of the io block. At least by VS 2015 the implementation
- * is something like:
- * stdio = _acrt_iob_func(0)
- * .. which is a function call, so should return the same pointer
- * regardless of call site.
- * As of _MSC_VER 1900 this patch is retired, at 16 years old.
- */
- if (0 <= result->fFileno && result->fFileno <= 2) {
- /* stdin, stdout and stderr need to be special cased for Windows 98 */
-#if _MSC_VER >= 1400
- result->fFile = &__iob_func()[_fileno(f)];
-#else
- result->fFile = &_iob[_fileno(f)];
-#endif
- }
- else
-#endif
- {
- result->fFile = f;
- }
+ result->fFile = f;
result->str.fBuffer = result->fUCBuffer;
result->str.fPos = result->fUCBuffer;
@@ -180,7 +157,11 @@ u_fopen_u(const UChar *filename,
#if U_PLATFORM_USES_ONLY_WIN32_API
/* Try Windows API _wfopen if the above fails. */
if (!result) {
- FILE *systemFile = _wfopen(filename, (UChar*)perm);
+ // TODO: test this code path, including wperm.
+ wchar_t wperm[40] = {};
+ size_t retVal;
+ mbstowcs_s(&retVal, wperm, UPRV_LENGTHOF(wperm), perm, _TRUNCATE);
+ FILE *systemFile = _wfopen((const wchar_t *)filename, wperm);
if (systemFile) {
result = finit_owner(systemFile, locale, codepage, TRUE);
}
@@ -208,7 +189,7 @@ u_fstropen(UChar *stringBuf,
result = (UFILE*) uprv_malloc(sizeof(UFILE));
/* Null pointer test */
if (result == NULL) {
- return NULL; /* Just get out. */
+ return NULL; /* Just get out. */
}
uprv_memset(result, 0, sizeof(UFILE));
result->str.fBuffer = stringBuf;
diff --git a/Build/source/libs/icu/icu-src/source/io/ufile.h b/Build/source/libs/icu/icu-src/source/io/ufile.h
index 3a1a22335ec..e85208fcd35 100644
--- a/Build/source/libs/icu/icu-src/source/io/ufile.h
+++ b/Build/source/libs/icu/icu-src/source/io/ufile.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
@@ -25,6 +25,8 @@
#if !UCONFIG_NO_CONVERSION
+#include <stdio.h>
+
#include "unicode/ucnv.h"
#include "unicode/utrans.h"
#include "locbund.h"
diff --git a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.c b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp
index e24d0d7a039..2b1a76fc8a2 100644
--- a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.c
+++ b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -187,7 +187,7 @@ ufmt_utop(const UChar *buffer,
}
/* iterate through buffer, stop when you hit the end */
- while(ufmt_isdigit(buffer[count], 16) && count < *len) {
+ while(count < *len && ufmt_isdigit(buffer[count], 16)) {
/* increment the count consumed */
++count;
}
diff --git a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.h b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.h
index 97079ed9d28..33b56a0175c 100644
--- a/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.h
+++ b/Build/source/libs/icu/icu-src/source/io/ufmt_cmn.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -26,7 +26,7 @@
#include "unicode/utf16.h"
#define UFMT_DEFAULT_BUFFER_SIZE 128
-#define MAX_UCHAR_BUFFER_SIZE(buffer) (sizeof(buffer)/(U16_MAX_LENGTH*sizeof(UChar)))
+#define MAX_UCHAR_BUFFER_SIZE(buffer) ((int32_t)(sizeof(buffer)/(U16_MAX_LENGTH*sizeof(UChar))))
#define MAX_UCHAR_BUFFER_NEEDED(strLen) ((strLen+1)*U16_MAX_LENGTH*sizeof(UChar))
/**
diff --git a/Build/source/libs/icu/icu-src/source/io/unicode/ustdio.h b/Build/source/libs/icu/icu-src/source/io/unicode/ustdio.h
index 8f38398cdb9..342c2b46045 100644
--- a/Build/source/libs/icu/icu-src/source/io/unicode/ustdio.h
+++ b/Build/source/libs/icu/icu-src/source/io/unicode/ustdio.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h b/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h
index ab52f6a28a0..c10ce6a2de5 100644
--- a/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h
+++ b/Build/source/libs/icu/icu-src/source/io/unicode/ustream.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
**********************************************************************
@@ -30,17 +30,11 @@
* C++ I/O stream API.
*/
-#if !defined(_MSC_VER)
+#if defined(__GLIBCXX__)
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#endif
-#if U_IOSTREAM_SOURCE >= 199711
-#if (__GNUC__ == 2)
#include <iostream>
-#else
-#include <istream>
-#include <ostream>
-#endif
U_NAMESPACE_BEGIN
@@ -67,4 +61,3 @@ U_NAMESPACE_END
/* No operator for UChar because it can conflict with wchar_t */
#endif
-#endif
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 b12ef0efed7..d433707ded9 100644
--- a/Build/source/libs/icu/icu-src/source/io/uprintf.cpp
+++ b/Build/source/libs/icu/icu-src/source/io/uprintf.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/uprintf.h b/Build/source/libs/icu/icu-src/source/io/uprintf.h
index 0a07e6b7d6a..0fd6066e562 100644
--- a/Build/source/libs/icu/icu-src/source/io/uprintf.h
+++ b/Build/source/libs/icu/icu-src/source/io/uprintf.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/uprntf_p.c b/Build/source/libs/icu/icu-src/source/io/uprntf_p.cpp
index 9890b29b964..1fbaf06c957 100644
--- a/Build/source/libs/icu/icu-src/source/io/uprntf_p.c
+++ b/Build/source/libs/icu/icu-src/source/io/uprntf_p.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
@@ -184,6 +184,9 @@ u_printf_simple_percent_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
+ (void)info;
+ (void)args;
static const UChar PERCENT[] = { UP_PERCENT };
/* put a single '%' onto the output */
@@ -198,6 +201,7 @@ u_printf_string_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
UChar *s;
UChar buffer[UFMT_DEFAULT_BUFFER_SIZE];
int32_t len, written;
@@ -248,6 +252,7 @@ u_printf_char_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
UChar s[U16_MAX_LENGTH+1];
int32_t len = 1, written;
unsigned char arg = (unsigned char)(args[0].int64Value);
@@ -418,6 +423,7 @@ u_printf_hex_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
int64_t num = args[0].int64Value;
UChar result[UPRINTF_BUFFER_SIZE];
int32_t len = UPRINTF_BUFFER_SIZE;
@@ -453,6 +459,7 @@ u_printf_octal_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
int64_t num = args[0].int64Value;
UChar result[UPRINTF_BUFFER_SIZE];
int32_t len = UPRINTF_BUFFER_SIZE;
@@ -539,7 +546,8 @@ u_printf_pointer_handler(const u_printf_stream_handler *handler,
ULocaleBundle *formatBundle,
const u_printf_spec_info *info,
const ufmt_args *args)
-{
+{
+ (void)formatBundle;
UChar result[UPRINTF_BUFFER_SIZE];
int32_t len = UPRINTF_BUFFER_SIZE;
@@ -751,6 +759,7 @@ u_printf_ustring_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
int32_t len, written;
const UChar *arg = (const UChar*)(args[0].ptrValue);
@@ -779,6 +788,7 @@ u_printf_uchar_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)formatBundle;
int32_t written = 0;
UChar arg = (UChar)(args[0].int64Value);
@@ -858,6 +868,9 @@ u_printf_count_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
+ (void)handler;
+ (void)context;
+ (void)formatBundle;
int32_t *count = (int32_t*)(args[0].ptrValue);
/* in the special case of count, the u_printf_spec_info's width */
diff --git a/Build/source/libs/icu/icu-src/source/io/uscanf.c b/Build/source/libs/icu/icu-src/source/io/uscanf.cpp
index 34368dade45..ce2e47a5881 100644
--- a/Build/source/libs/icu/icu-src/source/io/uscanf.c
+++ b/Build/source/libs/icu/icu-src/source/io/uscanf.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/uscanf.h b/Build/source/libs/icu/icu-src/source/io/uscanf.h
index 1140eee1c36..ebb8e79188c 100644
--- a/Build/source/libs/icu/icu-src/source/io/uscanf.h
+++ b/Build/source/libs/icu/icu-src/source/io/uscanf.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
diff --git a/Build/source/libs/icu/icu-src/source/io/uscanf_p.c b/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp
index ded984cef2d..4deac3544ec 100644
--- a/Build/source/libs/icu/icu-src/source/io/uscanf_p.c
+++ b/Build/source/libs/icu/icu-src/source/io/uscanf_p.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
@@ -380,6 +380,11 @@ u_scanf_simple_percent_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)info;
+ (void)args;
+ (void)fmt;
+ (void)fmtConsumed;
+
/* make sure the next character in the input is a percent */
*argConverted = 0;
if(u_fgetc(input) != 0x0025) {
@@ -396,6 +401,10 @@ u_scanf_count_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)input;
+ (void)fmt;
+ (void)fmtConsumed;
+
/* in the special case of count, the u_scanf_spec_info's width */
/* will contain the # of items converted thus far */
if (!info->fSkipArg) {
@@ -420,6 +429,9 @@ u_scanf_double_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
double num;
UNumberFormat *format;
@@ -485,6 +497,9 @@ u_scanf_scientific_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
double num;
UNumberFormat *format;
@@ -582,6 +597,9 @@ u_scanf_scidbl_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
double num;
UNumberFormat *scientificFormat, *genericFormat;
@@ -672,6 +690,9 @@ u_scanf_integer_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
void *num = (void*) (args[0].ptrValue);
UNumberFormat *format;
@@ -745,6 +766,9 @@ u_scanf_percent_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
double num;
UNumberFormat *format;
@@ -802,6 +826,9 @@ u_scanf_string_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
const UChar *source;
UConverter *conv;
char *arg = (char*)(args[0].ptrValue);
@@ -900,6 +927,9 @@ u_scanf_ustring_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
UChar *arg = (UChar*)(args[0].ptrValue);
UChar *alias = arg;
int32_t count;
@@ -969,6 +999,9 @@ u_scanf_spellout_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
double num;
UNumberFormat *format;
@@ -1028,6 +1061,9 @@ u_scanf_hex_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
int32_t skipped;
void *num = (void*) (args[0].ptrValue);
@@ -1084,6 +1120,9 @@ u_scanf_octal_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
int32_t skipped;
void *num = (void*) (args[0].ptrValue);
@@ -1131,6 +1170,9 @@ u_scanf_pointer_handler(UFILE *input,
int32_t *fmtConsumed,
int32_t *argConverted)
{
+ (void)fmt;
+ (void)fmtConsumed;
+
int32_t len;
int32_t skipped;
void *result;
diff --git a/Build/source/libs/icu/icu-src/source/io/ustdio.c b/Build/source/libs/icu/icu-src/source/io/ustdio.cpp
index 1c2225a9423..d6eb5cf9ec9 100644
--- a/Build/source/libs/icu/icu-src/source/io/ustdio.c
+++ b/Build/source/libs/icu/icu-src/source/io/ustdio.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
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 8e0087edbe6..948521a7fef 100644
--- a/Build/source/libs/icu/icu-src/source/io/ustream.cpp
+++ b/Build/source/libs/icu/icu-src/source/io/ustream.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
**********************************************************************
@@ -29,8 +29,6 @@
// console IO
-#if U_IOSTREAM_SOURCE >= 199711
-
#define STD_NAMESPACE std::
#define STD_OSTREAM STD_NAMESPACE ostream
@@ -170,4 +168,3 @@ STOP_READING:
U_NAMESPACE_END
#endif
-#endif