summaryrefslogtreecommitdiffstats
path: root/vm/Globals.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-06-07 17:38:12 -0700
committerElliott Hughes <enh@google.com>2011-06-07 17:38:12 -0700
commit689cc333b7be28b8b312f91999a31a2b0bd60c62 (patch)
tree3c8d740979cf96367a35ccf523251114a0b15555 /vm/Globals.h
parent708f143f318bb2167c810f9506102f4ad656545c (diff)
downloadandroid_dalvik-689cc333b7be28b8b312f91999a31a2b0bd60c62.tar.gz
android_dalvik-689cc333b7be28b8b312f91999a31a2b0bd60c62.tar.bz2
android_dalvik-689cc333b7be28b8b312f91999a31a2b0bd60c62.zip
Fix regular exit.
Change-Id: I653658f3b6e533a235f1108d0b625b9bdff7630c
Diffstat (limited to 'vm/Globals.h')
-rw-r--r--vm/Globals.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/vm/Globals.h b/vm/Globals.h
index 89a8d4740..0b4db59f8 100644
--- a/vm/Globals.h
+++ b/vm/Globals.h
@@ -69,8 +69,7 @@ enum RegisterMapMode {
/*
* All fields are initialized to zero.
*
- * Storage allocated here must be freed by a subsystem shutdown function or
- * from within freeGlobals().
+ * Storage allocated here must be freed by a subsystem shutdown function.
*/
struct DvmGlobals {
/*
@@ -158,7 +157,7 @@ struct DvmGlobals {
* This is effectively a set, where later entries override earlier
* ones.
*/
- std::vector<std::string> properties;
+ std::vector<std::string>* properties;
/*
* Where the VM goes to find system classes.