diff options
| author | Andrew John Hughes <gandalf@gcc.gnu.org> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gandalf@gcc.gnu.org> | 2012-03-23 15:19:26 +0000 |
| commit | 0563022a206294757effa44686727bffc4f7c2bd (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/java/text | |
| parent | 21669dfe20db0246ece395db5558a081a5c7088f (diff) | |
| download | gcc-0563022a206294757effa44686727bffc4f7c2bd.zip gcc-0563022a206294757effa44686727bffc4f7c2bd.tar.gz gcc-0563022a206294757effa44686727bffc4f7c2bd.tar.bz2 | |
Merge GNU Classpath 0.99 into libjava.
From-SVN: r185741
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/DateFormatSymbols.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/java/text/DateFormatSymbols.h b/libjava/java/text/DateFormatSymbols.h index b5cce7f..524fab1 100644 --- a/libjava/java/text/DateFormatSymbols.h +++ b/libjava/java/text/DateFormatSymbols.h @@ -23,7 +23,8 @@ extern "Java" class java::text::DateFormatSymbols : public ::java::lang::Object { - static JArray< ::java::lang::String * > * getStringArray(::java::util::ResourceBundle *, ::java::lang::String *); + static JArray< ::java::lang::String * > * getStringArray(::java::util::List *, ::java::lang::String *, jint); + static JArray< ::java::lang::String * > * getStringArray(::java::util::List *, ::java::lang::String *, jint, JArray< ::java::lang::String * > *); JArray< JArray< ::java::lang::String * > * > * getZoneStrings(::java::util::ResourceBundle *, ::java::util::Locale *); JArray< ::java::lang::String * > * formatsForKey(::java::util::ResourceBundle *, ::java::lang::String *); public: |