diff options
| author | Jose <jose@zeroc.com> | 2012-10-02 00:28:16 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-02 00:28:16 +0200 |
| commit | f3db9acbb5e6e1c43739f11ea7b31f189e936cd2 (patch) | |
| tree | 50c62c62669c2707f404f8539e8cda20dff1e304 /cpp/src/Slice/CsUtil.cpp | |
| parent | Fixed ICE-4813 - Protocol trace duplicate messages in .NET & Mono (diff) | |
| download | ice-f3db9acbb5e6e1c43739f11ea7b31f189e936cd2.tar.bz2 ice-f3db9acbb5e6e1c43739f11ea7b31f189e936cd2.tar.xz ice-f3db9acbb5e6e1c43739f11ea7b31f189e936cd2.zip | |
Fixed ICE-4589 - CsUtil fixId && clr:property
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CsUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 0c093af5e67..1ec3bff4a56 100644 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -136,7 +136,8 @@ Slice::CsGenerator::fixId(const ContainedPtr& cont, int baseTypes, bool mangleCa { ContainerPtr container = cont->container(); ContainedPtr contained = ContainedPtr::dynamicCast(container); - if(contained && contained->hasMetaData("clr:property")) + if(contained && contained->hasMetaData("clr:property") && + (contained->containedType() == Contained::ContainedTypeClass || contained->containedType() == Contained::ContainedTypeStruct)) { return cont->name() + "__prop"; } |