ICU-10483 Further #ifndef U_HIDE_XXX adjustments from running hdrtst

X-SVN-Rev: 34966

icu4c/source/common/unicode/enumset.h

@@ -17,12 +17,11 @@
 
 #include "unicode/utypes.h"
 
-#ifndef U_HIDE_INTERNAL_API
-
 #if U_SHOW_CPLUSPLUS_API
 
 U_NAMESPACE_BEGIN
 
+/* Can't use #ifndef U_HIDE_INTERNAL_API for the entire EnumSet class, needed in .h file declarations */
 /**
  * enum bitset for boolean fields. Similar to Java EnumSet<>. 
  * Needs to range check. Used for private instance variables.
@@ -34,6 +33,7 @@ public:
     inline EnumSet() : fBools(0) {}
     inline EnumSet(const EnumSet<T,minValue,limitValue>& other) : fBools(other.fBools) {}
     inline ~EnumSet() {}
+#ifndef U_HIDE_INTERNAL_API
     inline void clear() { fBools=0; }
     inline void add(T toAdd) { set(toAdd, 1); }
     inline void remove(T toRemove) { set(toRemove, 0); }
@@ -50,6 +50,7 @@ public:
     inline uint32_t getAll() const {
         return fBools; 
     }
+#endif /* U_HIDE_INTERNAL_API */
 
 private:
     inline uint32_t flag(T toCheck) const { return (1<<(toCheck-minValue)); }
@@ -60,5 +61,4 @@ private:
 U_NAMESPACE_END
 
 #endif /* U_SHOW_CPLUSPLUS_API */
-#endif /* U_HIDE_INTERNAL_API */
 #endif /* ENUMSET_H */

icu4c/source/common/unicode/listformatter.h

@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2012-2013, International Business Machines
+*   Copyright (C) 2012-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN
 /** @internal */
 class Hashtable;
 
-#ifndef U_HIDE_INTERNAL_API
+/* The following can't be #ifndef U_HIDE_INTERNAL_API, needed for other .h file declarations */
 /** @internal */
 struct ListFormatData : public UMemory {
     UnicodeString twoPattern;
@@ -40,7 +40,6 @@ struct ListFormatData : public UMemory {
   ListFormatData(const UnicodeString& two, const UnicodeString& start, const UnicodeString& middle, const UnicodeString& end) :
       twoPattern(two), startPattern(start), middlePattern(middle), endPattern(end) {}
 };
-#endif  /* U_HIDE_INTERNAL_API */
 
 
 /**

icu4c/source/i18n/unicode/dcfmtsym.h

@@ -1,6 +1,6 @@
 /*
 ********************************************************************************
-*   Copyright (C) 1997-2013, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
@@ -352,13 +352,13 @@ private:
     void setCurrencyForSymbols();
 
 public:
-#ifndef U_HIDE_INTERNAL_API
     /**
      * _Internal_ function - more efficient version of getSymbol,
      * returning a const reference to one of the symbol strings.
      * The returned reference becomes invalid when the symbol is changed
      * or when the DecimalFormatSymbols are destroyed.
      * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public.
+     * Note: moved #ifndef U_HIDE_INTERNAL_API after this, it is needed for inline in DecimalFormat
      *
      * @param symbol Constant to indicate a number format symbol.
      * @return the format symbol by the param 'symbol'
@@ -366,6 +366,7 @@ public:
      */
     inline const UnicodeString &getConstSymbol(ENumberFormatSymbol symbol) const;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Returns that pattern stored in currecy info. Internal API for use by NumberFormat API.
      * @internal

icu4c/source/i18n/unicode/dtfmtsym.h

@@ -505,14 +505,16 @@ public:
      */
     Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
 
-#ifndef U_HIDE_INTERNAL_API
+    /* The following type and kCapContextUsageTypeCount cannot be #ifndef U_HIDE_INTERNAL_API,
+       they are needed for .h file declarations. */ 
     /**
      * Constants for capitalization context usage types.
      * @internal
      */
     enum ECapitalizationContextUsageType
     {
-        kCapContextUsageOther,
+#ifndef U_HIDE_INTERNAL_API
+        kCapContextUsageOther = 0,
         kCapContextUsageMonthFormat,     /* except narrow */
         kCapContextUsageMonthStandalone, /* except narrow */
         kCapContextUsageMonthNarrow,
@@ -526,9 +528,9 @@ public:
         kCapContextUsageZoneShort,
         kCapContextUsageMetazoneLong,
         kCapContextUsageMetazoneShort,
-        kCapContextUsageTypeCount
-    };
 #endif /* U_HIDE_INTERNAL_API */
+        kCapContextUsageTypeCount = 14
+    };
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for the actual class.

icu4c/source/i18n/unicode/tzfmt.h

@@ -190,13 +190,12 @@ typedef enum UTimeZoneFormatGMTOffsetPatternType {
     UTZFMT_PAT_NEGATIVE_H,
 #endif /* U_HIDE_DRAFT_API */
 
-#ifndef U_HIDE_INTERNAL_API
+    /* The following cannot be #ifndef U_HIDE_INTERNAL_API, needed for other .h declarations */
     /**
      * Number of UTimeZoneFormatGMTOffsetPatternType types.
      * @internal
      */
     UTZFMT_PAT_COUNT = 6
-#endif /* U_HIDE_INTERNAL_API */
 } UTimeZoneFormatGMTOffsetPatternType;
 
 /**

icu4c/source/i18n/unicode/udat.h

@@ -838,35 +838,36 @@ udat_close(UDateFormat* format);
 
 
 /* Dont hide UDateFormatBooleanAttribute type with #ifndef U_HIDE_DRAFT_API, needed by virtual methods */
+/* Also don't hide UDAT_BOOLEAN_ATTRIBUTE_COUNT, needed by template class EnumSet<UDateFormatBooleanAttribute,...> */
 /**
  * DateFormat boolean attributes
  * 
  * @draft ICU 53
  */
 typedef enum UDateFormatBooleanAttribute {
- #ifndef U_HIDE_DRAFT_API
+#ifndef U_HIDE_DRAFT_API
    /**
      * indicates whether whitespace is allowed. Includes trailing dot tolerance.
      * @draft ICU 53
      */
-    UDAT_PARSE_ALLOW_WHITESPACE,
+    UDAT_PARSE_ALLOW_WHITESPACE = 0,
     /**
      * indicates tolerance of numeric data when String data may be assumed. eg: UDAT_YEAR_NAME_FIELD,
      * 		UDAT_STANDALONE_MONTH_FIELD, UDAT_DAY_OF_WEEK_FIELD
      * @draft ICU 53
      */
-    UDAT_PARSE_ALLOW_NUMERIC,
+    UDAT_PARSE_ALLOW_NUMERIC = 1,
     /**
      * indicates tolerance of a partial literal match
      * @draft ICU 53
      */
-    UDAT_PARSE_PARTIAL_MATCH,
+    UDAT_PARSE_PARTIAL_MATCH = 2,
+#endif /* U_HIDE_DRAFT_API */
     /**
      * count boolean date format constants
      * @draft ICU 53
      */
-    UDAT_BOOLEAN_ATTRIBUTE_COUNT
-#endif /* U_HIDE_DRAFT_API */
+    UDAT_BOOLEAN_ATTRIBUTE_COUNT = 3
 } UDateFormatBooleanAttribute;
 
 #ifndef U_HIDE_DRAFT_API

icu4c/source/i18n/unicode/unum.h

@@ -806,19 +806,20 @@ U_STABLE int32_t U_EXPORT2
 unum_countAvailable(void);
 
 #if UCONFIG_HAVE_PARSEALLINPUT
-#ifndef U_HIDE_INTERNAL_API
+/* The UNumberFormatAttributeValue type cannot be #ifndef U_HIDE_INTERNAL_API, needed for .h variable declaration */
 /**
  * @internal
  */
 typedef enum UNumberFormatAttributeValue {
+#ifndef U_HIDE_INTERNAL_API
   /** @internal */
   UNUM_NO = 0,
   /** @internal */
   UNUM_YES = 1,
   /** @internal */
   UNUM_MAYBE = 2
-} UNumberFormatAttributeValue;
 #endif /* U_HIDE_INTERNAL_API */
+} UNumberFormatAttributeValue;
 #endif
 
 /** The possible UNumberFormat numeric attributes @stable ICU 2.0 */
@@ -892,12 +893,13 @@ typedef enum UNumberFormatAttribute {
   /** Count of "regular" numeric attributes.
    * @internal */
   UNUM_NUMERIC_ATTRIBUTE_COUNT = UNUM_LENIENT_PARSE + 3,
+#endif  /* U_HIDE_INTERNAL_API */
 
+  /* The following cannot be #ifndef U_HIDE_INTERNAL_API, needed in .h file variable declararions */
   /** One below the first bitfield-boolean item.
    * All items after this one are stored in boolean form.
    * @internal */
   UNUM_MAX_NONBOOLEAN_ATTRIBUTE = 0x0FFF,
-#endif  /* U_HIDE_INTERNAL_API */
 
   /** If 1, specifies that if setting the "max integer digits" attribute would truncate a value, set an error status rather than silently truncating.
    * For example,  formatting the value 1234 with 4 max int digits would succeed, but formatting 12345 would fail. There is no effect on parsing.
@@ -913,11 +915,10 @@ typedef enum UNumberFormatAttribute {
    */
   UNUM_PARSE_NO_EXPONENT,
 
-#ifndef U_HIDE_INTERNAL_API
+  /* The following cannot be #ifndef U_HIDE_INTERNAL_API, needed in .h file variable declararions */
   /** Limit of boolean attributes.
    * @internal */
   UNUM_LIMIT_BOOLEAN_ATTRIBUTE
-#endif  /* U_HIDE_INTERNAL_API */
 } UNumberFormatAttribute;
 
 /**