Index: source/i18n/region.cpp |
diff --git a/source/i18n/region.cpp b/source/i18n/region.cpp |
index 15c5dd08ff4ad813ff0b1ddf36b765ccd7d9d204..81ddc233384c33a2b5540acfaaa0bf188a23b509 100644 |
--- a/source/i18n/region.cpp |
+++ b/source/i18n/region.cpp |
@@ -1,6 +1,8 @@ |
+// Copyright (C) 2016 and later: Unicode, Inc. and others. |
+// License & terms of use: http://www.unicode.org/copyright.html |
/* |
******************************************************************************* |
-* Copyright (C) 2014-2015, International Business Machines Corporation and |
+* Copyright (C) 2014-2016, International Business Machines Corporation and |
* others. All Rights Reserved. |
******************************************************************************* |
* |
@@ -67,7 +69,7 @@ static UVector *allRegions = NULL; |
static const UChar UNKNOWN_REGION_ID [] = { 0x5A, 0x5A, 0 }; /* "ZZ" */ |
static const UChar OUTLYING_OCEANIA_REGION_ID [] = { 0x51, 0x4F, 0 }; /* "QO" */ |
static const UChar WORLD_ID [] = { 0x30, 0x30, 0x31, 0 }; /* "001" */ |
-static const UChar RANGE_MARKER = 0x7eu; /* '~' */ |
+static const UChar RANGE_MARKER = 0x7E; /* '~' */ |
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration) |
@@ -79,7 +81,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(RegionNameEnumeration) |
* If the region data has already loaded, then this method simply returns without doing |
* anything meaningful. |
*/ |
-void Region::loadRegionData(UErrorCode &status) { |
+void U_CALLCONV Region::loadRegionData(UErrorCode &status) { |
// Construct service objs first |
LocalUHashtablePointer newRegionIDMap(uhash_open(uhash_hashUnicodeString, uhash_compareUnicodeString, NULL, &status)); |