You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2001/08/21 20:14:55 UTC

cvs commit: xml-xerces/c/src/validators/schema ComplexTypeInfo.cpp

knoaman     01/08/21 11:14:55

  Modified:    c/src/validators/schema ComplexTypeInfo.cpp
  Log:
  Defer creation of spec node.
  
  Revision  Changes    Path
  1.10      +6 -7      xml-xerces/c/src/validators/schema/ComplexTypeInfo.cpp
  
  Index: ComplexTypeInfo.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/validators/schema/ComplexTypeInfo.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ComplexTypeInfo.cpp	2001/08/21 16:06:11	1.9
  +++ ComplexTypeInfo.cpp	2001/08/21 18:14:55	1.10
  @@ -56,6 +56,9 @@
   
   /*
    * $Log: ComplexTypeInfo.cpp,v $
  + * Revision 1.10  2001/08/21 18:14:55  knoaman
  + * Defer creation of spec node.
  + *
    * Revision 1.9  2001/08/21 16:06:11  tng
    * Schema: Unique Particle Attribution Constraint Checking.
    *
  @@ -565,7 +568,7 @@
           }
           else {
   
  -            bool isRetAdopted = false;
  +            bool isRetAdopted = toAdoptSpecNode;
   
               if (minOccurs > 1) {
   
  @@ -580,15 +583,11 @@
                   isRetAdopted = true;
               }
   
  -            ContentSpecNode* optional = 0;
  -            if (isRetAdopted)
  -                optional = new ContentSpecNode(ContentSpecNode::ZeroOrOne, saveNode, 0, false);
  -            else
  -                optional = new ContentSpecNode(ContentSpecNode::ZeroOrOne, saveNode, 0, toAdoptSpecNode);
  -
               int counter = maxOccurs-minOccurs;
   
               if (counter > 0) {
  +
  +                ContentSpecNode* optional = new ContentSpecNode(ContentSpecNode::ZeroOrOne, saveNode, 0, false);
   
                   retNode = new ContentSpecNode(ContentSpecNode::Sequence,
   					                          retNode, optional, isRetAdopted, true);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org