diff options
| author | Jose <jose@zeroc.com> | 2014-10-22 13:21:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-22 13:21:20 +0200 |
| commit | e0baf57e883b320df04db5500ba91b0379634426 (patch) | |
| tree | 3e1fa14b2fa2ebb91589dbb60df4cb39f042c665 /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Fixed (ICE-5717) - Port IceDiscovery demo/test to scripting languages rb/php/py (diff) | |
| download | ice-e0baf57e883b320df04db5500ba91b0379634426.tar.bz2 ice-e0baf57e883b320df04db5500ba91b0379634426.tar.xz ice-e0baf57e883b320df04db5500ba91b0379634426.zip | |
Fixed (ICE-5550) - Remove cpp:range:array?
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 3f1104a156c..4ed37cd7ee4 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -73,7 +73,7 @@ sequenceTypeToString(const SequencePtr& seq, const StringList& metaData, int typ string seqType = findMetaData(metaData, typeCtx); if(!seqType.empty()) { - if(seqType == "%array" || seqType == "%range:array") + if(seqType == "%array") { BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type()); if(typeCtx & TypeContextAMIPrivateEnd) @@ -179,7 +179,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st } string s; - if(seqType == "%array" || seqType == "%range:array") + if(seqType == "%array") { s = typeToString(seq, metaData, TypeContextAMIPrivateEnd); } @@ -216,7 +216,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& seqType = findMetaData(seq->getMetaData(), TypeContextInParam); } - if(seqType == "%array" || seqType == "%range:array") + if(seqType == "%array") { BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type()); if(builtin && @@ -906,7 +906,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, bool optional if(seq && !(typeCtx & TypeContextAMIPrivateEnd)) { string seqType = findMetaData(metaData, typeCtx); - if(seqType == "%array" || seqType == "%range:array") + if(seqType == "%array") { BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type()); if(builtin && builtin->kind() == Builtin::KindByte) @@ -971,7 +971,7 @@ Slice::getEndArg(const TypePtr& type, const StringList& metaData, const string& seqType = findMetaData(seq->getMetaData(), TypeContextInParam); } - if(seqType == "%array" || seqType == "%range:array") + if(seqType == "%array") { BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type()); if(builtin && @@ -1035,7 +1035,7 @@ Slice::findMetaData(const StringList& metaData, int typeCtx) // // The priority of the metadata is as follows: // 1: protobuf - // 2: array, range, range:array, view-type for "view" parameters + // 2: array, range, view-type for "view" parameters // 3: class if(pos != string::npos) |