diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2xsd/Gen.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2xsd/ice.xsd | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/slice2xsd/Gen.cpp b/cpp/src/slice2xsd/Gen.cpp index 79161fa1d8b..82f5a09b3a4 100644 --- a/cpp/src/slice2xsd/Gen.cpp +++ b/cpp/src/slice2xsd/Gen.cpp @@ -563,7 +563,6 @@ Slice::Gen::toString(const SyntaxTreeBasePtr& p) "xs:float", "xs:double", "xs:string", - "xs:string", "ice:_internal.objectType", /* Object */ "ice:_internal.proxyType", /* Object* */ "???" /* LocalObject */ @@ -586,7 +585,8 @@ Slice::Gen::toString(const SyntaxTreeBasePtr& p) if (cl) { string scopeId = containedToId(cl); - s = "tns:" + internalId + scopeId + cl->name() + "Type"; + //s = "tns:" + internalId + scopeId + cl->name() + "Type"; + s = "ice:_internal.reference"; } ExceptionPtr ex = ExceptionPtr::dynamicCast(p); diff --git a/cpp/src/slice2xsd/ice.xsd b/cpp/src/slice2xsd/ice.xsd index 4e4112cda06..06dd041f40c 100644 --- a/cpp/src/slice2xsd/ice.xsd +++ b/cpp/src/slice2xsd/ice.xsd @@ -34,6 +34,7 @@ All Rights Reserved <xs:element name="facets" type="tns:_internal.facetType"/> </xs:sequence> <xs:attribute name="id" type="xs:string"/> + <xs:attribute name="type" type="xs:string"/> </xs:complexType> <xs:element name="object" type="tns:_internal.objectType"/> @@ -60,10 +61,15 @@ All Rights Reserved <xs:complexType name="dataType"> <xs:sequence> - <xs:any namespace="##any" minOccurs="0"/> + <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> <xs:element name="data" type="tns:dataType"/> + <xs:complexType name="_internal.reference"> + <xs:sequence/> + <xs:attribute name="href" type="xs:anyURI" use="required"/> + </xs:complexType> + </xs:schema> |