diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-23 20:19:06 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-23 20:19:06 +0000 |
| commit | dea399b9ca84ed668aa3da7477dacd04e0192fa5 (patch) | |
| tree | e4235e098426338fd3e0a267c1a8652af558814c /libjava/java/util/Formatter.h | |
| parent | 3d956c0659ce15647c319f5e5988034f9e157095 (diff) | |
| download | gcc-dea399b9ca84ed668aa3da7477dacd04e0192fa5.tar.gz | |
2008-10-23 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r141325
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@141329 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/Formatter.h')
| -rw-r--r-- | libjava/java/util/Formatter.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libjava/java/util/Formatter.h b/libjava/java/util/Formatter.h index 5d513ed786d..71a659f6632 100644 --- a/libjava/java/util/Formatter.h +++ b/libjava/java/util/Formatter.h @@ -11,6 +11,16 @@ extern "Java" { + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } namespace java { namespace text @@ -44,7 +54,7 @@ private: ::java::lang::String * getName(jint); void checkFlags(jint, jint, jchar); void noPrecision(jint); - void applyLocalization(::java::lang::StringBuilder *, jint, jint, jboolean); + void applyLocalization(::gnu::java::lang::CPStringBuilder *, jint, jint, jboolean); void genericFormat(::java::lang::String *, jint, jint, jint); void booleanFormat(::java::lang::Object *, jint, jint, jint, jchar); void hashCodeFormat(::java::lang::Object *, jint, jint, jint, jchar); @@ -52,10 +62,10 @@ private: void characterFormat(::java::lang::Object *, jint, jint, jint, jchar); void percentFormat(jint, jint, jint); void newLineFormat(jint, jint, jint); - ::java::lang::StringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); + ::gnu::java::lang::CPStringBuilder * basicIntegralConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void hexOrOctalConversion(::java::lang::Object *, jint, jint, jint, jint, jchar); void decimalConversion(::java::lang::Object *, jint, jint, jint, jchar); - void singleDateTimeConversion(::java::lang::StringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); + void singleDateTimeConversion(::gnu::java::lang::CPStringBuilder *, ::java::util::Calendar *, jchar, ::java::text::DateFormatSymbols *); void dateTimeConversion(::java::lang::Object *, jint, jint, jint, jchar, jchar); void advance(); jint parseInt(); |