Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/src/c/matlab/io/MatlabVectorToDoubleVector.cpp

    r12878 r13101  
    4646               
    4747                /*Check that input is actualy a vector*/
    48                 if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column");
     48                if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
    4949
    5050                nz=(int)((double)nnz/(double)rows);
    … …  
    7777
    7878                /*Check that input is actualy a vector*/
    79                 if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column");
     79                if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
    8080
    8181                /*allocate and memcpy*/
Note: See TracChangeset for help on using the changeset viewer.