summaryrefslogtreecommitdiffstats
path: root/vm/Misc.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-06-07 14:24:45 -0700
committerElliott Hughes <enh@google.com>2011-06-07 14:24:45 -0700
commitb08e2b6017770e887f6072c1520b2d7f2ef6916c (patch)
treec3bc3c5c471c42b71de8c1431f9726faddbfe660 /vm/Misc.h
parent0fbb7030fff58e25718291811394487d95d95a3e (diff)
downloadandroid_dalvik-b08e2b6017770e887f6072c1520b2d7f2ef6916c.tar.gz
android_dalvik-b08e2b6017770e887f6072c1520b2d7f2ef6916c.tar.bz2
android_dalvik-b08e2b6017770e887f6072c1520b2d7f2ef6916c.zip
Switch dvmHumanReadableDescriptor over to std::string.
(Prep work before making a change to stack dumps.) Change-Id: I0af49b920f450fd2611e4b96e717a637483122d6
Diffstat (limited to 'vm/Misc.h')
-rw-r--r--vm/Misc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/vm/Misc.h b/vm/Misc.h
index 7ce970887..aabddfb99 100644
--- a/vm/Misc.h
+++ b/vm/Misc.h
@@ -20,9 +20,12 @@
#ifndef _DALVIK_MISC
#define _DALVIK_MISC
+#include <string>
+
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
+
#include "Inlines.h"
/*
@@ -141,7 +144,7 @@ char* dvmDotToSlash(const char* str);
* of 'descriptor'. So "I" would be "int", "[[I" would be "int[][]",
* "[Ljava/lang/String;" would be "java.lang.String[]", and so forth.
*/
-extern "C" char* dvmHumanReadableDescriptor(const char* descriptor);
+std::string dvmHumanReadableDescriptor(const char* descriptor);
/*
* Return a newly-allocated string for the "dot version" of the class