[cgma-dev] r4476 - cgm/trunk/itaps

[Tim Tautges]

Correct; thanks for catching that.

- tim

On 02/03/2011 10:23 PM, Iulian Grindeanu wrote:
> I have a question about branch cubit 12:
> Should we keep it in sync with the main line?
>
> For example, this change should be committed to the cubit 12 branch, otherwise test_edgemesh in meshkit/test/algs built against cubit 12 will fail. I am not sure about other recent commits in cgm.
>
> Iulian
>
> ----- Original Message -----
>> Author: tautges
>> Date: 2011-01-30 19:24:31 -0600 (Sun, 30 Jan 2011)
>> New Revision: 4476
>>
>> Modified:
>> cgm/trunk/itaps/iGeom_CGMA.cc
>> Log:
>> Wasn't initializing error code returned from a few sense functions.
>>
>>
>>
>> Modified: cgm/trunk/itaps/iGeom_CGMA.cc
>> ===================================================================
>> --- cgm/trunk/itaps/iGeom_CGMA.cc 2011-01-28 23:20:54 UTC (rev 4475)
>> +++ cgm/trunk/itaps/iGeom_CGMA.cc 2011-01-31 01:24:31 UTC (rev 4476)
>> @@ -3404,6 +3404,7 @@
>> ERROR(iBase_INVALID_ENTITY_TYPE, "2nd argument to getGtangentSense
>> must be a face.");
>> }
>> *rel_sense = iGeom_get_nonmanifold_sense( edge_ent, face_ent, err );
>> + RETURN(iBase_SUCCESS);
>> }
>>
>> void
>> @@ -3486,6 +3487,7 @@
>> ERROR(iBase_INVALID_ENTITY_TYPE, "Bad entity argument to
>> getGvertexTangentSense.");
>> }
>> *rel_sense = iGeom_edge_vertex_sense( this_edge, vertex1, vertex2, err
>> );
>> + RETURN(iBase_SUCCESS);
>> }
>>
>> void
>> @@ -6648,8 +6650,11 @@
>> se_list.reset();
>> CubitSense sense = se_list.get_and_step()->get_sense();
>> for (int i = se_list.size() - 1; i>  0; --i)
>> - if (se_list.get_and_step()->get_sense() != sense)
>> + if (se_list.get_and_step()->get_sense() != sense) {
>> + *err = iBase_SUCCESS;
>> return 0;
>> + }
>> + *err = iBase_SUCCESS;
>> return sense == CUBIT_FORWARD ? 1 : -1;
>> }
>

-- 
================================================================
"You will keep in perfect peace him whose mind is
   steadfast, because he trusts in you."               Isaiah 26:3

              Tim Tautges            Argonne National Laboratory
          (tautges at mcs.anl.gov)      (telecommuting from UW-Madison)
          phone: (608) 263-8485      1500 Engineering Dr.
            fax: (608) 263-4499      Madison, WI 53706