summaryrefslogtreecommitdiff
path: root/tools/gnu/classpath/tools/javah/ClassWrapper.java
diff options
context:
space:
mode:
Diffstat (limited to 'tools/gnu/classpath/tools/javah/ClassWrapper.java')
-rw-r--r--tools/gnu/classpath/tools/javah/ClassWrapper.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/gnu/classpath/tools/javah/ClassWrapper.java b/tools/gnu/classpath/tools/javah/ClassWrapper.java
index 1f4d26a23..4b4d25046 100644
--- a/tools/gnu/classpath/tools/javah/ClassWrapper.java
+++ b/tools/gnu/classpath/tools/javah/ClassWrapper.java
@@ -260,7 +260,7 @@ public class ClassWrapper
if (bridgeTargets.contains(sum))
nameToUse = (String) methodNameMap.get(sum);
else
- nameToUse = Keywords.getCxxName(m.name);
+ nameToUse = m.name;
methodNameMap.put(sum, nameToUse);
MethodHelper.print(out, m, this, nameToUse);
}
@@ -291,7 +291,8 @@ public class ClassWrapper
public void print(CniPrintStream out)
{
- out.print("::" + name.replaceAll("/", "::"));
+ out.print("::");
+ out.printName(name);
}
// This prints the body of a class to a CxxPrintStream.
@@ -303,7 +304,7 @@ public class ClassWrapper
out.print("class ");
// Don't use our print() -- we don't want the leading "::".
- out.print(name.replaceAll("/", "::"));
+ out.printName(name);
if (superClass != null)
{
out.print(" : public ");