Fixed problems around escaping of inherited method names.

3 files changed, 36 insertions, 2 deletions

diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index 563db12e712..259080b2d20 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -28,7 +28,7 @@ public:
     static void validateMetaData(const UnitPtr&);
 
 protected:
-    static std::string fixId(const std::string&);
+    static std::string fixId(const std::string&, int = 0, bool = false);
     static std::string typeToString(const TypePtr&);
     static bool isValueType(const TypePtr&);
     //
diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h
new file mode 100755
index 00000000000..f8a089ecec6
--- /dev/null
+++ b/cpp/include/Slice/DotNetNames.h
@@ -0,0 +1,34 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef DOTNETNAMES_H
+#define DOTNETNAMES_H
+
+#include <string>
+
+namespace Slice
+{
+
+namespace DotNet
+{
+
+enum BaseType
+{
+    Object=1, ICloneable=2, Exception=4, ApplicationException=8, END=16
+};
+
+extern const char * manglePrefix;
+
+std::string mangleName(const std::string&, int baseTypes = 0);
+
+}
+
+}
+
+#endif
diff --git a/cpp/include/Slice/VbUtil.h b/cpp/include/Slice/VbUtil.h
index 3b818d8e41b..7ccc9410853 100644
--- a/cpp/include/Slice/VbUtil.h
+++ b/cpp/include/Slice/VbUtil.h
@@ -28,7 +28,7 @@ public:
     static void validateMetaData(const UnitPtr&);
 
 protected:
-    static std::string fixId(const std::string&);
+    static std::string fixId(const std::string&, int = 0, bool = false);
     static std::string typeToString(const TypePtr&);
     static bool isValueType(const TypePtr&);
     //