OLD | NEW |
1 diff --git a/source/common/locmap.c b/source/common/locmap.c | 1 diff --git a/source/common/locmap.c b/source/common/locmap.c |
2 index c746ce3..224a2b1 100644 | 2 index c03cd5c..d564380 100644 |
3 --- a/source/common/locmap.c | 3 --- a/source/common/locmap.c |
4 +++ b/source/common/locmap.c | 4 +++ b/source/common/locmap.c |
5 @@ -29,6 +29,7 @@ | 5 @@ -31,6 +31,7 @@ |
6 #include "cstring.h" | 6 #include "cstring.h" |
7 #include "cmemory.h" | 7 #include "cmemory.h" |
8 | 8 |
9 +#if 0 | 9 +#if 0 |
10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) | 10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) |
11 /* | 11 /* |
12 * TODO: It seems like we should widen this to | 12 * TODO: It seems like we should widen this to |
13 @@ -40,6 +41,7 @@ | 13 @@ -42,6 +43,7 @@ |
14 */ | 14 */ |
15 #define USE_WINDOWS_LOCALE_API | 15 #define USE_WINDOWS_LOCALE_API |
16 #endif | 16 #endif |
17 +#endif | 17 +#endif |
18 | 18 |
19 #ifdef USE_WINDOWS_LOCALE_API | 19 #ifdef USE_WINDOWS_LOCALE_API |
20 #include <windows.h> | 20 #include <windows.h> |
21 diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp | |
22 index 0fb2b3e..007713e 100644 | |
23 --- a/source/common/stringpiece.cpp | |
24 +++ b/source/common/stringpiece.cpp | |
25 @@ -68,6 +68,14 @@ operator==(const StringPiece& x, const StringPiece& y) { | |
26 } | |
27 | |
28 | |
29 +/* Microsoft Visual Studio (even 2013) complains about redefinition of this | |
30 + * static const class variable. However, the C++ standard states that this | |
31 + * definition is correct. Perhaps there is a bug in the Microsoft compiler. | |
32 + * This is not an issue on any other compilers (that we know of). | |
33 + * Cygwin with MSVC 9.0 also complains here about redefinition. | |
34 + */ | |
35 +#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC) | |
36 const int32_t StringPiece::npos = 0x7fffffff; | |
37 +#endif | |
38 | |
39 U_NAMESPACE_END | |
40 diff --git a/source/i18n/dtfmtsym.cpp b/source/i18n/dtfmtsym.cpp | |
41 index e99670d..c9a3502 100644 | |
42 --- a/source/i18n/dtfmtsym.cpp | |
43 +++ b/source/i18n/dtfmtsym.cpp | |
44 @@ -169,7 +169,7 @@ SharedDateFormatSymbols::~SharedDateFormatSymbols() { | |
45 template<> U_I18N_API | |
46 const SharedDateFormatSymbols * | |
47 LocaleCacheKey<SharedDateFormatSymbols>::createObject( | |
48 - const void */*unusedContext*/, UErrorCode &status) const { | |
49 + const void * /*unusedContext*/, UErrorCode &status) const { | |
50 char type[256]; | |
51 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status
); | |
52 if (U_FAILURE(status)) { | |
53 diff --git a/source/common/sharedobject.h b/source/common/sharedobject.h | |
54 index 4402869..e5062cc 100644 | |
55 --- a/source/common/sharedobject.h | |
56 +++ b/source/common/sharedobject.h | |
57 @@ -21,7 +21,7 @@ U_NAMESPACE_BEGIN | |
58 * update cache metrics. No other part of ICU, except for SharedObject, | |
59 * should directly call the methods of this base class. | |
60 */ | |
61 -class UnifiedCacheBase : public UObject { | |
62 +class U_COMMON_API UnifiedCacheBase : public UObject { | |
63 public: | |
64 UnifiedCacheBase() { } | |
65 | |
OLD | NEW |