[sword-cvs] icu-sword/source/test/perf/charperf Makefile.in,1.1,1.2 charperf.cpp,1.1,1.2 charperf.h,1.1,1.2

[sword@www.crosswire.org]

Update of /cvs/core/icu-sword/source/test/perf/charperf
In directory www:/tmp/cvs-serv8911/source/test/perf/charperf

Modified Files:
	Makefile.in charperf.cpp charperf.h 
Log Message:
ICU 2.8 sync

Index: Makefile.in
===================================================================
RCS file: /cvs/core/icu-sword/source/test/perf/charperf/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	10 Sep 2003 02:42:50 -0000	1.1
+++ Makefile.in	6 Apr 2004 10:09:49 -0000	1.2
@@ -1,12 +1,12 @@
-## Makefile.in for ICU - test/ucharperf
-## Copyright (c) 2001, International Business Machines Corporation and
+## Makefile.in for ICU - test/charperf
+## Copyright (c) 2001-2003, International Business Machines Corporation and
 ## others. All Rights Reserved.
 
 ## Source directory information
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 
-top_builddir = ../..
+top_builddir = ../../..
 
 include $(top_builddir)/icudefs.mk
 
@@ -14,16 +14,16 @@
 include @platform_make_fragment@
 
 ## Build directory information
-subdir = test/ucharperf
+subdir = test/charperf
 
 ## Extra files to remove for 'make clean'
 CLEANFILES = *~ $(DEPS)
 
 ## Target information
-TARGET = ucharperf
+TARGET = charperf
 
 DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common 
+CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/tools/toolutil 
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 ENABLE_RPATH = @ENABLE_RPATH@
@@ -31,9 +31,9 @@
 RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
 endif
 LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
-LIBS = $(LIBICUUC) @LIBS@ @LIB_M@
+LIBS = $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@
 
-OBJECTS = ucharperf.o
+OBJECTS = charperf.o
 
 DEPS = $(OBJECTS:.o=.d)
 

Index: charperf.cpp
===================================================================
RCS file: /cvs/core/icu-sword/source/test/perf/charperf/charperf.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- charperf.cpp	10 Sep 2003 02:42:50 -0000	1.1
+++ charperf.cpp	6 Apr 2004 10:09:49 -0000	1.2
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT:
- * Copyright (C) 2002 IBM, Inc.   All Rights Reserved.
+ * Copyright (C) 2002-2003 IBM, Inc.   All Rights Reserved.
  *
  ********************************************************************/
 /*****************************************************************************
@@ -68,8 +68,15 @@
 			        (int32_t)(sizeof(options)/sizeof(options[0])), options);
 	}
 	MIN_ = 0;
-    MAX_ = 0xffff;
-
+    if (sizeof(wchar_t) > 2)  {
+        // for stdlibs like glibc that supports 32 bits wchar
+        // we test for the whole unicode character set by default
+        MAX_ = 0x10ffff;
+    }
+    else {
+        MAX_ = 0xffff;
+    }
+    printf("MAX_ size will be 0x%x\n", MAX_);
 	if (options[MIN_OPTION_].doesOccur) {
 		MIN_ = atoi(options[MIN_OPTION_].value);
 	}

Index: charperf.h
===================================================================
RCS file: /cvs/core/icu-sword/source/test/perf/charperf/charperf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- charperf.h	10 Sep 2003 02:42:50 -0000	1.1
+++ charperf.h	6 Apr 2004 10:09:49 -0000	1.2
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2002, International Business Machines
+* Copyright (c) 2002-2003, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 **********************************************************************
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
+#include <wctype.h>
 
 typedef void (*CharPerfFn)(UChar32 ch);
 typedef void (*StdLibCharPerfFn)(wchar_t ch);
@@ -234,4 +235,4 @@
 	iswspace(ch);
 }
 
-#endif // CHARPERF_H
\ No newline at end of file
+#endif // CHARPERF_H