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/classes/kriging/Quadtree.cpp

    r12821 r13101  
    8383/*FUNCTION Quadtree::Quadtree(){{{*/
    8484Quadtree::Quadtree(){
    85         _error2_("Constructor not supported");
     85        _error_("Constructor not supported");
    8686
    8787}
    … …  
    248248        }
    249249        else{
    250                 _error2_("Box is not full");
     250                _error_("Box is not full");
    251251        }
    252252}/*}}}*/
    … …  
    397397                        break;
    398398                default:
    399                         _error2_("Case " << index << " not supported");
     399                        _error_("Case " << index << " not supported");
    400400        }
    401401        newbox->length=master->length/2;
    … …  
    574574                        break;
    575575                default:
    576                         _error2_("Case " << this->IsWithinRange(x,y,range) << " not supported");
     576                        _error_("Case " << this->IsWithinRange(x,y,range) << " not supported");
    577577        }
    578578
Note: See TracChangeset for help on using the changeset viewer.