Remove anonymous namespaces.
No one likes them and we're pretty inconsistent at using them. We're
much better with 'static'.
Change-Id: I65eeffd0fb60633edca30923af0caedb06a0105d
diff --git a/src/dalvik_system_VMStack.cc b/src/dalvik_system_VMStack.cc
index 8560c22..7ba4d14 100644
--- a/src/dalvik_system_VMStack.cc
+++ b/src/dalvik_system_VMStack.cc
@@ -25,8 +25,6 @@
namespace art {
-namespace {
-
static jobject GetThreadStack(JNIEnv* env, jobject javaThread) {
ScopedHeapLock heap_lock;
ScopedThreadListLock thread_list_lock;
@@ -34,7 +32,7 @@
return (thread != NULL) ? GetThreadStack(env, thread) : NULL;
}
-jint VMStack_fillStackTraceElements(JNIEnv* env, jclass, jobject javaThread, jobjectArray javaSteArray) {
+static jint VMStack_fillStackTraceElements(JNIEnv* env, jclass, jobject javaThread, jobjectArray javaSteArray) {
jobject trace = GetThreadStack(env, javaThread);
if (trace == NULL) {
return 0;
@@ -44,7 +42,7 @@
return depth;
}
-jobject VMStack_getCallingClassLoader(JNIEnv* env, jclass) {
+static jobject VMStack_getCallingClassLoader(JNIEnv* env, jclass) {
// Returns the defining class loader of the caller's caller.
// TODO: need SmartFrame (Thread::WalkStack-like iterator).
Frame frame = Thread::Current()->GetTopOfStack();
@@ -56,7 +54,7 @@
return AddLocalReference<jobject>(env, cl);
}
-jobject VMStack_getClosestUserClassLoader(JNIEnv* env, jclass, jobject javaBootstrap, jobject javaSystem) {
+static jobject VMStack_getClosestUserClassLoader(JNIEnv* env, jclass, jobject javaBootstrap, jobject javaSystem) {
struct ClosestUserClassLoaderVisitor : public Thread::StackVisitor {
ClosestUserClassLoaderVisitor(Object* bootstrap, Object* system)
: bootstrap(bootstrap), system(system), class_loader(NULL) {}
@@ -81,7 +79,7 @@
return AddLocalReference<jobject>(env, visitor.class_loader);
}
-jclass VMStack_getStackClass2(JNIEnv* env, jclass) {
+static jclass VMStack_getStackClass2(JNIEnv* env, jclass) {
// Returns the class of the caller's caller's caller.
// TODO: need SmartFrame (Thread::WalkStack-like iterator).
Frame frame = Thread::Current()->GetTopOfStack();
@@ -94,7 +92,7 @@
return AddLocalReference<jclass>(env, c);
}
-jobjectArray VMStack_getThreadStackTrace(JNIEnv* env, jclass, jobject javaThread) {
+static jobjectArray VMStack_getThreadStackTrace(JNIEnv* env, jclass, jobject javaThread) {
jobject trace = GetThreadStack(env, javaThread);
if (trace == NULL) {
return NULL;
@@ -110,8 +108,6 @@
NATIVE_METHOD(VMStack, getThreadStackTrace, "(Ljava/lang/Thread;)[Ljava/lang/StackTraceElement;"),
};
-} // namespace
-
void register_dalvik_system_VMStack(JNIEnv* env) {
jniRegisterNativeMethods(env, "dalvik/system/VMStack", gMethods, NELEM(gMethods));
}