summaryrefslogtreecommitdiff
path: root/cpp/src/slice2freezej/Main.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2004-02-18 15:21:26 +0000
committerBernard Normier <bernard@zeroc.com>2004-02-18 15:21:26 +0000
commiteb6a7b2e8ce772ff5131db09b50836ad67af39cc (patch)
tree1748518f193ac1be58b037ccd7c4e914f18ba7a0 /cpp/src/slice2freezej/Main.cpp
parentfix (diff)
downloadice-eb6a7b2e8ce772ff5131db09b50836ad67af39cc.tar.bz2
ice-eb6a7b2e8ce772ff5131db09b50836ad67af39cc.tar.xz
ice-eb6a7b2e8ce772ff5131db09b50836ad67af39cc.zip
Fixed --index scoping bug
Diffstat (limited to 'cpp/src/slice2freezej/Main.cpp')
-rw-r--r--cpp/src/slice2freezej/Main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 8d8c0ed20e4..e0b2d9c0c30 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -500,12 +500,14 @@ FreezeGenerator::generate(UnitPtr& u, const Index& index)
//
// Key marshalling
//
+ string typeString = typeToString(type, TypeModeIn);
+
out << sp << nl << "protected byte[]" << nl
<< "marshalKey(Ice.Object __servant)";
out << sb;
- out << nl << "if(__servant instanceof " << index.type << ")";
+ out << nl << "if(__servant instanceof " << typeString << ")";
out << sb;
- out << nl << memberTypeString << " __key = ((" << index.type << ")__servant)." << index.member << ";";
+ out << nl << memberTypeString << " __key = ((" << typeString << ")__servant)." << index.member << ";";
out << nl << "return marshalKey(__key);";
out << eb;
out << nl << "else";