organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21061 ICU-21085 Merge latest changes from double-conversion

Browse source
This commit is contained in:
Shane F. Carr 2020-04-21 18:21:55 -05:00
parent 925376a904
commit b5973eee64
5 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/i18n/double-conversion-utils.h
View file

@ -66,15 +66,23 @@ inline void abort_noreturn() { abort(); }
#endif
#endif
// Not all compilers support __has_attribute and combining a check for both
// ifdef and __has_attribute on the same preprocessor line isn't portable.
#ifdef __has_attribute
# define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) __has_attribute(x)
#else
# define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) 0
#endif
#ifndef DOUBLE_CONVERSION_UNUSED
#ifdef __GNUC__
#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(unused)
#define DOUBLE_CONVERSION_UNUSED __attribute__((unused))
#else
#define DOUBLE_CONVERSION_UNUSED
#endif
#endif
#if defined(__clang__) && __has_attribute(uninitialized)
#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(uninitialized)
#define DOUBLE_CONVERSION_STACK_UNINITIALIZED __attribute__((uninitialized))
#else
#define DOUBLE_CONVERSION_STACK_UNINITIALIZED

12
vendor/double-conversion/upstream/double-conversion/utils.h vendored
View file

@ -56,15 +56,23 @@ inline void abort_noreturn() { abort(); }
#endif
#endif
// Not all compilers support __has_attribute and combining a check for both
// ifdef and __has_attribute on the same preprocessor line isn't portable.
#ifdef __has_attribute
# define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) __has_attribute(x)
#else
# define DOUBLE_CONVERSION_HAS_ATTRIBUTE(x) 0
#endif
#ifndef DOUBLE_CONVERSION_UNUSED
#ifdef __GNUC__
#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(unused)
#define DOUBLE_CONVERSION_UNUSED __attribute__((unused))
#else
#define DOUBLE_CONVERSION_UNUSED
#endif
#endif
#if defined(__clang__) && __has_attribute(uninitialized)
#if DOUBLE_CONVERSION_HAS_ATTRIBUTE(uninitialized)
#define DOUBLE_CONVERSION_STACK_UNINITIALIZED __attribute__((uninitialized))
#else
#define DOUBLE_CONVERSION_STACK_UNINITIALIZED

9
vendor/double-conversion/upstream/msvc/double-conversion.vcxproj vendored
View file

@ -147,24 +147,25 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\double-conversion\bignum-dtoa.cc" />
<ClCompile Include="..\double-conversion\bignum.cc" />
<ClCompile Include="..\double-conversion\bignum-dtoa.cc" />
<ClCompile Include="..\double-conversion\cached-powers.cc" />
<ClCompile Include="..\double-conversion\diy-fp.cc" />
<ClCompile Include="..\double-conversion\double-conversion.cc" />
<ClCompile Include="..\double-conversion\double-to-string.cc" />
<ClCompile Include="..\double-conversion\fast-dtoa.cc" />
<ClCompile Include="..\double-conversion\fixed-dtoa.cc" />
<ClCompile Include="..\double-conversion\string-to-double.cc" />
<ClCompile Include="..\double-conversion\strtod.cc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\double-conversion\bignum-dtoa.h" />
<ClInclude Include="..\double-conversion\bignum.h" />
<ClInclude Include="..\double-conversion\cached-powers.h" />
<ClInclude Include="..\double-conversion\diy-fp.h" />
<ClInclude Include="..\double-conversion\double-conversion.h" />
<ClInclude Include="..\double-conversion\double-to-string.h" />
<ClInclude Include="..\double-conversion\fast-dtoa.h" />
<ClInclude Include="..\double-conversion\fixed-dtoa.h" />
<ClInclude Include="..\double-conversion\ieee.h" />
<ClInclude Include="..\double-conversion\string-to-double.h" />
<ClInclude Include="..\double-conversion\strtod.h" />
<ClInclude Include="..\double-conversion\utils.h" />
</ItemGroup>

21
vendor/double-conversion/upstream/msvc/double-conversion.vcxproj.filters vendored
View file

@ -24,12 +24,6 @@
<ClCompile Include="..\double-conversion\cached-powers.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\double-conversion\diy-fp.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\double-conversion\double-conversion.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\double-conversion\fast-dtoa.cc">
<Filter>Source Files</Filter>
</ClCompile>
@ -39,14 +33,17 @@
<ClCompile Include="..\double-conversion\strtod.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\double-conversion\double-to-string.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\double-conversion\string-to-double.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\double-conversion\bignum.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\double-conversion\bignum-dtoa.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\double-conversion\cached-powers.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -71,5 +68,11 @@
<ClInclude Include="..\double-conversion\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\double-conversion\double-to-string.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\double-conversion\string-to-double.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
vendor/double-conversion/upstream/msvc/run_tests/run_tests.vcxproj vendored
View file

@ -109,6 +109,7 @@
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)..</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>