organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-10272 the clang workaround was only *mostly* harmless. Disable it under Windows. Fix: typeinfo(82): error C2874: using-declaration causes a multiple declaration of 'type_info'

Browse source 
X-SVN-Rev: 35375
This commit is contained in:
Steven R. Loomis 2014-03-07 00:30:23 +00:00
parent 901f2644d8
commit c866020da6
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/common/unicode/std_string.h
View file

@ -27,7 +27,10 @@
#if U_HAVE_STD_STRING
#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
#else
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#endif
#include <string>
#endif // U_HAVE_STD_STRING

3
icu4c/source/common/utypeinfo.h
View file

@ -21,8 +21,9 @@
#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
#include <exception>
using std::exception;
#else
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#endif
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#include <typeinfo> // for 'typeid' to work
#endif

5
icu4c/source/io/unicode/ustream.h
View file

@ -26,7 +26,10 @@
* C++ I/O stream API.
*/
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
#else
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#endif
#if U_IOSTREAM_SOURCE >= 199711
#if (__GNUC__ == 2)

3
icu4c/source/test/intltest/dcfmtest.cpp
View file

@ -29,7 +29,10 @@
#include <string.h>
#include <stdio.h>
#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
#else
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
#endif
#include <string>
#include <iostream>