ICU-8451 Cleanup use of U_EXPORT2 in Region class for windows build

X-SVN-Rev: 33051

diff --git a/icu4c/source/i18n/region.cpp b/icu4c/source/i18n/region.cpp
index 506f852e48676b06b57fff9e5e46c586583d1ce9..77713d70b7302afdef6d9a0031a2816345805032 100644 (file)
--- a/icu4c/source/i18n/region.cpp
+++ b/icu4c/source/i18n/region.cpp
@@ -323,7 +323,7 @@ Region::Region () {
 /**\r
  * Returns true if the two regions are equal.\r
  */\r
-UBool U_EXPORT2\r
+UBool\r
 Region::operator==(const Region &that) const {\r
     return (idStr == that.idStr);\r
 }\r
@@ -331,7 +331,7 @@ Region::operator==(const Region &that) const {
 /**\r
  * Returns true if the two regions are NOT equal; that is, if operator ==() returns false.\r
  */\r
-UBool U_EXPORT2\r
+UBool\r
 Region::operator!=(const Region &that) const {\r
         return (idStr != that.idStr);\r
 }\r
@@ -379,7 +379,7 @@ Region::getInstance(const char *region_code, UErrorCode &status) {
  * Returns a pointer to a Region using the given numeric region code. If the numeric region code is not recognized,\r
  * the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ).\r
  */\r
-const Region * U_EXPORT2\r
+const Region* U_EXPORT2 \r
 Region::getInstance (int32_t code, UErrorCode &status) {\r
 \r
     loadRegionData();\r
@@ -417,7 +417,7 @@ Region::getInstance (int32_t code, UErrorCode &status) {
 /**\r
  * Returns an enumeration over the IDs of all known regions that match the given type.\r
  */\r
-StringEnumeration * U_EXPORT2\r
+StringEnumeration* U_EXPORT2\r
 Region::getAvailable(URegionType type) {\r
     \r
     loadRegionData();\r
@@ -432,7 +432,7 @@ Region::getAvailable(URegionType type) {
  * or "ZZ" (Unknown region). For example, calling this method with region "IT" (Italy) returns the\r
  * region "039" (Southern Europe).\r
  */\r
-const Region * U_EXPORT2\r
+const Region*\r
 Region::getContainingRegion() const {\r
     loadRegionData();\r
     return containingRegion;\r
@@ -445,7 +445,7 @@ Region::getContainingRegion() const {
  * are not appropriate for use in this API. NULL will be returned in this case. For example, calling this method\r
  * with region "IT" (Italy) for type "URGN_CONTINENT" returns the region "150" ( Europe ).\r
  */\r
-const Region* U_EXPORT2\r
+const Region*\r
 Region::getContainingRegion(URegionType type) const {\r
     loadRegionData();\r
     if ( containingRegion == NULL ) {\r
@@ -467,7 +467,7 @@ Region::getContainingRegion(URegionType type) const {
  * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)\r
  * and "155" (Western Europe).\r
  */\r
-StringEnumeration * U_EXPORT2\r
+StringEnumeration*\r
 Region::getContainedRegions() const {\r
     loadRegionData();\r
     UErrorCode status = U_ZERO_ERROR;\r
@@ -480,7 +480,7 @@ Region::getContainedRegions() const {
  * sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type\r
  * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )\r
  */\r
-StringEnumeration * U_EXPORT2\r
+StringEnumeration*\r
 Region::getContainedRegions( URegionType type ) const {\r
     loadRegionData();\r
 \r
@@ -509,7 +509,7 @@ Region::getContainedRegions( URegionType type ) const {
 /**\r
  * Returns true if this region contains the supplied other region anywhere in the region hierarchy.\r
  */\r
-UBool U_EXPORT2\r
+UBool\r
 Region::contains(const Region &other) const {\r
     loadRegionData();\r
 \r
@@ -536,7 +536,7 @@ Region::contains(const Region &other) const {
  * regions for this region.  Returns NULL for a non-deprecated region.  For example, calling this method with region\r
  * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...\r
  */\r
-StringEnumeration * U_EXPORT2\r
+StringEnumeration*\r
 Region::getPreferredValues() const {\r
     loadRegionData();\r
     UErrorCode status = U_ZERO_ERROR;\r
@@ -551,7 +551,7 @@ Region::getPreferredValues() const {
 /**\r
  * Return this region's canonical region code.\r
  */\r
-const char * U_EXPORT2\r
+const char*\r
 Region::getRegionCode() const {\r
     return id;\r
 }\r
@@ -559,7 +559,7 @@ Region::getRegionCode() const {
 /**\r
  * Return this region's numeric code. Returns UNDEFINED_NUMERIC_CODE (-1) if the given region does not have a numeric code assigned to it.\r
  */\r
-int32_t U_EXPORT2\r
+int32_t\r
 Region::getNumericCode() const {\r
     return code;\r
 }\r
@@ -567,7 +567,7 @@ Region::getNumericCode() const {
 /**\r
  * Returns the region type of this region.\r
  */\r
-URegionType U_EXPORT2\r
+URegionType\r
 Region::getType() const {\r
     return type;\r
 }\r
@@ -577,7 +577,7 @@ RegionNameEnumeration::RegionNameEnumeration(UVector *fNameList, UErrorCode& /*s
     fRegionNames = fNameList;\r
 }\r
 \r
-const char *\r
+const char*\r
 RegionNameEnumeration::next(int32_t *resultLength, UErrorCode& status) {\r
     if (U_SUCCESS(status) && pos < fRegionNames->size()) {\r
         if (resultLength != NULL) {\r

diff --git a/icu4c/source/i18n/unicode/region.h b/icu4c/source/i18n/unicode/region.h
index 9b89c76921d5229bcb65603c8f8706e85f13c033..b1333deeac66925daa3970f222f71d5cb99dcf6d 100644 (file)
--- a/icu4c/source/i18n/unicode/region.h
+++ b/icu4c/source/i18n/unicode/region.h
@@ -147,8 +147,6 @@ public:
      * @draft ICU 51\r
      */\r
     UBool operator!=(const Region &that) const;\r
-\r
-\r
  \r
     /**\r
      * Returns a pointer to a Region using the given region code.  The region code can be either 2-letter ISO code,\r
@@ -157,20 +155,20 @@ public:
      * If the region code is NULL or not recognized, the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR )\r
      * @draft ICU 51 \r
      */\r
-    static const Region *getInstance(const char *region_code, UErrorCode &status);\r
+    static const Region* U_EXPORT2 getInstance(const char *region_code, UErrorCode &status);\r
 \r
     /**\r
      * Returns a pointer to a Region using the given numeric region code. If the numeric region code is not recognized,\r
      * the appropriate error code will be set ( U_ILLEGAL_ARGUMENT_ERROR ).\r
      * @draft ICU 51 \r
      */\r
-    static const Region *getInstance (int32_t code, UErrorCode &status);\r
+    static const Region* U_EXPORT2 getInstance (int32_t code, UErrorCode &status);\r
 \r
     /**\r
      * Returns an enumeration over the IDs of all known regions that match the given type.\r
      * @draft ICU 51 \r
      */\r
-    static StringEnumeration *getAvailable(URegionType type);\r
+    static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);\r
    \r
     /**\r
      * Returns a pointer to the region that contains this region.  Returns NULL if this region is code "001" (World)\r
@@ -178,7 +176,7 @@ public:
      * region "039" (Southern Europe).\r
      * @draft ICU 51 \r
      */\r
-    const Region *getContainingRegion() const;\r
+    const Region* getContainingRegion() const;\r
 \r
     /**\r
      * Return a pointer to the region that geographically contains this region and matches the given type,\r
@@ -199,7 +197,7 @@ public:
      * and "155" (Western Europe).\r
      * @draft ICU 51 \r
      */\r
-    StringEnumeration *getContainedRegions() const;\r
+    StringEnumeration* getContainedRegions() const;\r
 \r
     /**\r
      * Returns an enumeration over the IDs of all the regions that are children of this region anywhere in the region\r
@@ -208,7 +206,7 @@ public:
      * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )\r
      * @draft ICU 51 \r
      */\r
-    StringEnumeration *getContainedRegions( URegionType type ) const;\r
+    StringEnumeration* getContainedRegions( URegionType type ) const;\r
  \r
     /**\r
      * Returns true if this region contains the supplied other region anywhere in the region hierarchy.\r
@@ -222,14 +220,14 @@ public:
      * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...\r
      * @draft ICU 51 \r
      */\r
-    StringEnumeration *getPreferredValues() const;\r
+    StringEnumeration* getPreferredValues() const;\r
  \r
 \r
     /**\r
      * Return this region's canonical region code.\r
      * @draft ICU 51 \r
      */\r
-    const char *getRegionCode() const;\r
+    const char* getRegionCode() const;\r
 \r
     /**\r
      * Return this region's numeric code. Returns UNDEFINED_NUMERIC_CODE (-1) if the given region does not have a numeric code assigned to it.\r