ICU 56 update step 1

source/test/intltest/nmfmtrt.cpp

 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2011, International Business Machines Corporation
+ * Copyright (c) 1997-2015, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "nmfmtrt.h"
 
 #include "unicode/dcfmtsym.h"
 #include "unicode/decimfmt.h"
 #include "unicode/locid.h"
 #include "putilimp.h"
 
 #include <float.h>
 #include <stdio.h>    // for sprintf
 #include <stdlib.h>
  
 // *****************************************************************************
 // class NumberFormatRoundTripTest
 // *****************************************************************************
 
 UBool NumberFormatRoundTripTest::verbose                  = FALSE;
 UBool NumberFormatRoundTripTest::STRING_COMPARE           = TRUE;
 UBool NumberFormatRoundTripTest::EXACT_NUMERIC_COMPARE    = FALSE;
-UBool NumberFormatRoundTripTest::DEBUG                    = FALSE;
+UBool NumberFormatRoundTripTest::DEBUG_VAR                = FALSE;
 double NumberFormatRoundTripTest::MAX_ERROR               = 1e-14;
 double NumberFormatRoundTripTest::max_numeric_error       = 0.0;
 double NumberFormatRoundTripTest::min_numeric_error       = 1.0;
 
 #define CASE(id,test) case id: name = #test; if (exec) { logln(#test "---"); logln((UnicodeString)""); test(); } break;
 
 void NumberFormatRoundTripTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
 {
     // if (exec) logln((UnicodeString)"TestSuite NumberFormatRoundTripTest");
     switch (index) {
@@ skipping 196 matching lines @@
     }
     UErrorCode status = U_ZERO_ERROR;
     UnicodeString s, s2, temp;
     if(isDouble(value))
         s = fmt->format(value.getDouble(), s);
     else
         s = fmt->format(value.getLong(), s);
 
     Formattable n;
     UBool show = verbose;
-    if(DEBUG)
+    if(DEBUG_VAR)
         logln(/*value.getString(temp) +*/ " F> " + escape(s));
 
     fmt->parse(s, n, status);
     failure(status, "fmt->parse");
-    if(DEBUG) 
+    if(DEBUG_VAR) 
         logln(escape(s) + " P> " /*+ n.getString(temp)*/);
 
     if(isDouble(n))
         s2 = fmt->format(n.getDouble(), s2);
     else
         s2 = fmt->format(n.getLong(), s2);
     
-    if(DEBUG) 
+    if(DEBUG_VAR) 
         logln(/*n.getString(temp) +*/ " F> " + escape(s2));
 
     if(STRING_COMPARE) {
         if (s != s2) {
             errln("*** STRING ERROR \"" + escape(s) + "\" != \"" + escape(s2) + "\"");
             show = TRUE;
         }
     }
 
     if(EXACT_NUMERIC_COMPARE) {
@@ skipping 78 matching lines @@
             s += "+U";
             char temp[16];
             sprintf(temp, "%4X", c);        // might not work
             s += temp;
         }
     }
     return s;
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */