summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2009-07-23 16:04:40 +0200
committerJose <jose@zeroc.com>2009-07-23 16:04:40 +0200
commitd6baf6fd7662532fc7fd8a1b60fdbd0c3094c432 (patch)
tree1df5eb489c8c1f186ef753a1f0f3d51287b642b1 /cpp/src/slice2java/Gen.cpp
parentMerge branch 'vsplugin' (diff)
downloadice-d6baf6fd7662532fc7fd8a1b60fdbd0c3094c432.tar.bz2
ice-d6baf6fd7662532fc7fd8a1b60fdbd0c3094c432.tar.xz
ice-d6baf6fd7662532fc7fd8a1b60fdbd0c3094c432.zip
4171 - remove IceE support for Java.
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
-rw-r--r--cpp/src/slice2java/Gen.cpp44
1 files changed, 21 insertions, 23 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 83ac90a6dd7..26c06297ba1 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3951,36 +3951,34 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
// indicates the use of a generic type.
//
bool suppressUnchecked = false;
- if(_featureProfile != Slice::IceE)
- {
- string instanceType, formalType;
- bool customType = getSequenceTypes(p, "", StringList(), instanceType, formalType);
- if(!customType)
+ string instanceType, formalType;
+ bool customType = getSequenceTypes(p, "", StringList(), instanceType, formalType);
+
+ if(!customType)
+ {
+ //
+ // Determine sequence depth.
+ //
+ int depth = 0;
+ TypePtr origContent = p->type();
+ SequencePtr s = SequencePtr::dynamicCast(origContent);
+ while(s)
{
//
- // Determine sequence depth.
+ // Stop if the inner sequence type has a custom, serializable or protobuf type.
//
- int depth = 0;
- TypePtr origContent = p->type();
- SequencePtr s = SequencePtr::dynamicCast(origContent);
- while(s)
+ if(hasTypeMetaData(s))
{
- //
- // Stop if the inner sequence type has a custom, serializable or protobuf type.
- //
- if(hasTypeMetaData(s))
- {
- break;
- }
- depth++;
- origContent = s->type();
- s = SequencePtr::dynamicCast(origContent);
+ break;
}
-
- string origContentS = typeToString(origContent, TypeModeIn, package);
- suppressUnchecked = origContentS.find('<') != string::npos;
+ depth++;
+ origContent = s->type();
+ s = SequencePtr::dynamicCast(origContent);
}
+
+ string origContentS = typeToString(origContent, TypeModeIn, package);
+ suppressUnchecked = origContentS.find('<') != string::npos;
}
open(helper);