commit 0512f02dd6623c0870c11fbf3274d7462f732136
author Elliott Hughes <enh@google.com> Thu Mar 15 22:10:52 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Mar 15 22:10:52 2012 -0700
tree c90b32c42b285d3cea45272601b5cf007b4ea264
parent 88c5c355fc3d881f905564911d746b2313d5fc89

Remove anonymous namespaces.

No one likes them and we're pretty inconsistent at using them. We're
much better with 'static'.

Change-Id: I65eeffd0fb60633edca30923af0caedb06a0105d

src/java_lang_String.cc

diff --git a/src/java_lang_String.cc b/src/java_lang_String.cc
index ff182e1..c549c08 100644
--- a/src/java_lang_String.cc
+++ b/src/java_lang_String.cc
@@ -36,9 +36,7 @@
 
 namespace art {
 
-namespace {
-
-jint String_compareTo(JNIEnv* env, jobject javaThis, jobject javaRhs) {
+static jint String_compareTo(JNIEnv* env, jobject javaThis, jobject javaRhs) {
   ScopedThreadStateChange tsc(Thread::Current(), Thread::kRunnable);
   String* lhs = Decode<String*>(env, javaThis);
   String* rhs = Decode<String*>(env, javaRhs);
@@ -72,7 +70,7 @@
   return countDiff;
 }
 
-jboolean String_equals(JNIEnv* env, jobject javaThis, jobject javaRhs) {
+static jboolean String_equals(JNIEnv* env, jobject javaThis, jobject javaRhs) {
   String* lhs = Decode<String*>(env, javaThis);
   String* rhs = Decode<String*>(env, javaRhs);
 
@@ -128,7 +126,7 @@
  *
  * Returns -1 if no match is found.
  */
-jint String_fastIndexOf(JNIEnv* env, jobject javaThis, jint ch, jint start) {
+static jint String_fastIndexOf(JNIEnv* env, jobject javaThis, jint ch, jint start) {
   String* s = Decode<String*>(env, javaThis);
   const uint16_t* chars = s->GetCharArray()->GetData() + s->GetOffset();
 
@@ -148,21 +146,19 @@
   return -1;
 }
 
-jstring String_intern(JNIEnv* env, jobject javaThis) {
+static jstring String_intern(JNIEnv* env, jobject javaThis) {
   String* s = Decode<String*>(env, javaThis);
   String* result = s->Intern();
   return AddLocalReference<jstring>(env, result);
 }
 
-JNINativeMethod gMethods[] = {
+static JNINativeMethod gMethods[] = {
   NATIVE_METHOD(String, compareTo, "(Ljava/lang/String;)I"),
   NATIVE_METHOD(String, equals, "(Ljava/lang/Object;)Z"),
   NATIVE_METHOD(String, fastIndexOf, "(II)I"),
   NATIVE_METHOD(String, intern, "()Ljava/lang/String;"),
 };
 
-}  // namespace
-
 void register_java_lang_String(JNIEnv* env) {
   jniRegisterNativeMethods(env, "java/lang/String", gMethods, NELEM(gMethods));
 }