ICU-1264 Fix for HP/UX aCC namespace support

X-SVN-Rev: 6205

icu4c/source/common/unorm.cpp

@@ -2282,7 +2282,6 @@ unorm_normalize(const UChar *src, int32_t srcLength,
                                    pErrorCode);
 }
 
-U_NAMESPACE_BEGIN
 
 /* iteration functions ------------------------------------------------------ */
 
@@ -2670,9 +2669,9 @@ unorm_nextNormalize(UChar *&dest, int32_t &destCapacity,
     return destLength;
 }
 
-U_NAMESPACE_END
 /*
  * ### TODO: check if NF*D and FCD iteration finds optimal boundaries
  * and if not, how hard it would be to improve it.
  * For example, see _findSafeFCD().
  */
+

icu4c/source/i18n/translit.cpp

@@ -86,6 +86,8 @@ static UMTX registryMutex = 0;
  */
 static TransliteratorRegistry* registry = 0;
 
+U_NAMESPACE_BEGIN
+
 /**
  * Class identifier for subclasses of Transliterator that do not
  * define their class (anonymous subclasses).
@@ -1506,6 +1508,8 @@ void Transliterator::initializeRegistry(void) {
     ucln_i18n_registerCleanup();
 }
 
+U_NAMESPACE_END
+
 // Defined in ucln_in.h:
 
 /**
@@ -1520,6 +1524,5 @@ U_CFUNC UBool transliterator_cleanup(void) {
     return TRUE;
 }
 
-U_NAMESPACE_END
-
 //eof
+

icu4c/source/i18n/uniset.cpp

@@ -42,22 +42,9 @@
 #define UPPER_U         ((UChar)0x0055) /*U*/
 #define LOWER_U         ((UChar)0x0075) /*u*/
 
-U_NAMESPACE_BEGIN
-
-/**
- * Minimum value that can be stored in a UnicodeSet.
- */
-const UChar32 UnicodeSet::MIN_VALUE = UNICODESET_LOW;
-
-/**
- * Maximum value that can be stored in a UnicodeSet.
- */
-const UChar32 UnicodeSet::MAX_VALUE = UNICODESET_HIGH - 1;
-
 // N.B.: This mapping is different in ICU and Java
 //const UnicodeString UnicodeSet::CATEGORY_NAMES(
 //    "CnLuLlLtLmLoMnMeMcNdNlNoZsZlZpCcCfCoCsPdPsPePcPoSmScSkSoPiPf", "");
-
 static const UChar CATEGORY_NAMES[] = {
     0x43, 0x6E, /* "Cn" */
     0x4C, 0x75, /* "Lu" */
@@ -118,6 +105,18 @@ U_CFUNC UBool unicodeset_cleanup(void) {
     return TRUE;
 }
 
+U_NAMESPACE_BEGIN
+
+/**
+ * Minimum value that can be stored in a UnicodeSet.
+ */
+const UChar32 UnicodeSet::MIN_VALUE = UNICODESET_LOW;
+
+/**
+ * Maximum value that can be stored in a UnicodeSet.
+ */
+const UChar32 UnicodeSet::MAX_VALUE = UNICODESET_HIGH - 1;
+
 //----------------------------------------------------------------
 // Constructors &c
 //----------------------------------------------------------------