ICU-5420 fix some namespace/linkage issues

X-SVN-Rev: 24122

icu4c/source/i18n/ucol_imp.h

@@ -316,9 +316,13 @@ struct collIterateState {
 U_CAPI void U_EXPORT2 
 uprv_init_collIterate(const UCollator *collator, const UChar *sourceString, int32_t sourceLen, collIterate *s);
 
+U_NAMESPACE_BEGIN
+
 struct UCollationPCE;
 typedef struct UCollationPCE UCollationPCE;
 
+U_NAMESPACE_END
+
 struct UCollationElements
 {
   /**

icu4c/source/i18n/ucoleitr.cpp

@@ -50,6 +50,8 @@ struct RCEI
     int32_t  high;
 };
 
+U_NAMESPACE_BEGIN
+
 struct RCEBuffer
 {
     RCEI    defaultBuffer[DEFAULT_BUFFER_SIZE];
@@ -237,6 +239,10 @@ UCollationPCE::~UCollationPCE()
     // nothing to do
 }
 
+
+U_NAMESPACE_END
+
+
 inline uint64_t processCE(UCollationElements *elems, uint32_t ce)
 {
     uint64_t primary = 0, secondary = 0, tertiary = 0, quaternary = 0;
@@ -291,6 +297,8 @@ uprv_init_pce(const UCollationElements *elems)
     }
 }
 
+
+
 /* public methods ---------------------------------------------------- */
 
 U_CAPI UCollationElements* U_EXPORT2

icu4c/source/i18n/usearch.cpp

@@ -21,6 +21,8 @@
 #include "ucln_in.h"
 #include "uassert.h"
 
+U_NAMESPACE_USE
+
 // don't use Boyer-Moore
 #define BOYER_MOORE 0
 
@@ -3446,6 +3448,9 @@ struct  CEI {
     int32_t highIndex;
 };
 
+U_NAMESPACE_BEGIN
+
+
 //
 //  CEBuffer   A circular buffer of CEs from the text being searched.
 //
@@ -3574,6 +3579,9 @@ const CEI *CEBuffer::getPrevious(int32_t index) {
     return &buf[i];
 }
 
+U_NAMESPACE_END
+
+
 // #define USEARCH_DEBUG
 
 #ifdef USEARCH_DEBUG