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/util | |
| 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/util')
| -rw-r--r-- | libjava/java/util/HashMap.h | 2 | ||||
| -rw-r--r-- | libjava/java/util/regex/Matcher.h | 1 | ||||
| -rw-r--r-- | libjava/java/util/regex/Pattern.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libjava/java/util/HashMap.h b/libjava/java/util/HashMap.h index 5b8c77f..8cd7518 100644 --- a/libjava/java/util/HashMap.h +++ b/libjava/java/util/HashMap.h @@ -42,7 +42,7 @@ private: void writeObject(::java::io::ObjectOutputStream *); void readObject(::java::io::ObjectInputStream *); public: // actually package-private - static const jint DEFAULT_CAPACITY = 11; + static const jint DEFAULT_CAPACITY = 16; static jfloat DEFAULT_LOAD_FACTOR; private: static const jlong serialVersionUID = 362498820763181265LL; diff --git a/libjava/java/util/regex/Matcher.h b/libjava/java/util/regex/Matcher.h index 74230ef..bb59f88 100644 --- a/libjava/java/util/regex/Matcher.h +++ b/libjava/java/util/regex/Matcher.h @@ -62,6 +62,7 @@ public: jboolean hasAnchoringBounds(); ::java::util::regex::Matcher * useAnchoringBounds(jboolean); ::java::util::regex::MatchResult * toMatchResult(); + static ::java::lang::String * quoteReplacement(::java::lang::String *); private: ::java::util::regex::Pattern * __attribute__((aligned(__alignof__( ::java::lang::Object)))) pattern__; ::java::lang::CharSequence * input; diff --git a/libjava/java/util/regex/Pattern.h b/libjava/java/util/regex/Pattern.h index 267cafd..5536aec 100644 --- a/libjava/java/util/regex/Pattern.h +++ b/libjava/java/util/regex/Pattern.h @@ -41,6 +41,7 @@ public: JArray< ::java::lang::String * > * split(::java::lang::CharSequence *); JArray< ::java::lang::String * > * split(::java::lang::CharSequence *, jint); ::java::lang::String * pattern(); + static ::java::lang::String * quote(::java::lang::String *); ::java::lang::String * toString(); private: static const jlong serialVersionUID = 5073258162644648461LL; |