Update ICU to 54.1 step 1

source/tools/genrb/wrtxml.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2002-2012, International Business Machines
+*   Copyright (C) 2002-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *
 * File wrtxml.cpp
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   10/01/02    Ram         Creation.
 *   02/07/08    Spieth      Correct XLIFF generation on EBCDIC platform
 *
 *******************************************************************************
 */
+
+// Safer use of UnicodeString.
+#ifndef UNISTR_FROM_CHAR_EXPLICIT
+#   define UNISTR_FROM_CHAR_EXPLICIT explicit
+#endif
+
+// Less important, but still a good idea.
+#ifndef UNISTR_FROM_STRING_EXPLICIT
+#   define UNISTR_FROM_STRING_EXPLICIT explicit
+#endif
+
 #include "reslist.h"
 #include "unewdata.h"
 #include "unicode/ures.h"
 #include "errmsg.h"
 #include "filestrm.h"
 #include "cstring.h"
 #include "unicode/ucnv.h"
 #include "genrb.h"
 #include "rle.h"
-#include "ucol_tok.h"
 #include "uhash.h"
 #include "uresimp.h"
 #include "unicode/ustring.h"
 #include "unicode/uchar.h"
 #include "ustr.h"
 #include "prscmnts.h"
 #include "unicode/unistr.h"
 #include "unicode/utf8.h"
 #include "unicode/utf16.h"
 #include <time.h>
@@ skipping 1075 matching lines @@
     if (U_FAILURE(*status)) {
         goto cleanup_bundle_write_xml;
     }
 
     out= T_FileStream_open(xmlfileName,"w");
 
     if(out==NULL){
         *status = U_FILE_ACCESS_ERROR;
         goto cleanup_bundle_write_xml;
     }
-    write_utf8_file(out, xmlHeader);
+    write_utf8_file(out, UnicodeString(xmlHeader));
 
     if(outputEnc && *outputEnc!='\0'){
         /* store the output encoding */
         enc = outputEnc;
         conv=ucnv_open(enc,status);
         if(U_FAILURE(*status)){
             goto cleanup_bundle_write_xml;
         }
     }
-    write_utf8_file(out, bundleStart);
+    write_utf8_file(out, UnicodeString(bundleStart));
     write_tabs(out);
-    write_utf8_file(out, fileStart);
+    write_utf8_file(out, UnicodeString(fileStart));
     /* check if lang and language are the same */
     if(language != NULL && uprv_strcmp(lang, srBundle->fLocale)!=0){
         fprintf(stderr,"Warning: The top level tag in the resource and language specified are not the same. Please check the input.\n");
     }
     write_utf8_file(out, UnicodeString(lang));
     write_utf8_file(out, UnicodeString(file1));
     write_utf8_file(out, UnicodeString(file2));
     write_utf8_file(out, UnicodeString(originalFileName));
     write_utf8_file(out, UnicodeString(file4));
 
     time(&currTime);
     strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&currTime));
     write_utf8_file(out, UnicodeString(timeBuf));
     write_utf8_file(out, UnicodeString("\">\n"));
 
     tabCount += 1;
     write_tabs(out);
-    write_utf8_file(out, headerStart);
+    write_utf8_file(out, UnicodeString(headerStart));
 
     tabCount += 1;
     write_tabs(out);
 
-    write_utf8_file(out, tool_start);
+    write_utf8_file(out, UnicodeString(tool_start));
     printAttribute("tool-id", tool_id, (int32_t) uprv_strlen(tool_id));
     printAttribute("tool-name", tool_name, (int32_t) uprv_strlen(tool_name));
     write_utf8_file(out, UnicodeString("/>\n"));
 
     tabCount -= 1;
     write_tabs(out);
 
     write_utf8_file(out, UnicodeString(headerEnd));
 
     write_tabs(out);
@@ skipping 21 matching lines @@
 cleanup_bundle_write_xml:
     uprv_free(originalFileName);
     uprv_free(lang);
     if(xmlfileName != NULL) {
         uprv_free(xmlfileName);
     }
     if(outputFileName != NULL){
         uprv_free(outputFileName);
     }
 }