summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/CPlusPlusUtil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index da8f51b293a..40400966279 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -611,21 +611,21 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const
{
ClassDefPtr def = cl->definition();
string factory;
- string type;
+ string typeName;
if(def && !def->isAbstract())
{
factory = fixKwd(cl->scoped());
factory += "::ice_factory()";
- type = fixKwd(cl->scoped());
- type += "::ice_staticId()";
+ typeName = fixKwd(cl->scoped());
+ typeName += "::ice_staticId()";
}
else
{
factory = "0";
- type = "\"\"";
+ typeName = "\"\"";
}
out << nl << scope << "__" << streamFunc << "Object(" << stream << ", " << tagName << ", "
- << type << ", " << factory << ", " << fixedParam << ");";
+ << typeName << ", " << factory << ", " << fixedParam << ");";
}
out << eb;