Changeset 4223 for branches/1.3/src


Ignore:
Timestamp:
Mar 11, 2014 9:20:33 AM (6 years ago)
Author:
ldelgass
Message:

merge r3919:3920 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/src/core/RpLibrary.cc

    r3717 r4223  
    18741874    scew_element *tmpNode   = NULL;
    18751875    const char *contents    = NULL;
    1876     int retVal              = 1;
    18771876    int deleteTmpNode       = 0;
    18781877
     
    19401939                    // maybe we want to count the number of children
    19411940                    // that we have successfully added?
    1942                     retVal = 0;
    19431941                }
    19441942                else {
  • branches/1.3/src/core/RpUnits.cc

    r3177 r4223  
    13351335    std::string type = "";     // junk var used because units2list requires it
    13361336    std::string retStr = "";
    1337     double origNumVal = 0;
    13381337    double numVal = 0;
    13391338    double toExp = 0;
     
    13651364
    13661365    convErr = unitSlice(val,fromUnitsName,numVal);
    1367     origNumVal = numVal;
    13681366
    13691367    if (convErr != 0) {
Note: See TracChangeset for help on using the changeset viewer.