/[escript]/trunk/escript/src/DataArrayView.cpp
ViewVC logotype

Diff of /trunk/escript/src/DataArrayView.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1311 by gross, Thu May 10 08:11:31 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
 // $Id$  
1    
2  /*  /* $Id$ */
3   ************************************************************  
4   *          Copyright 2006 by ACcESS MNRF                   *  /*******************************************************
5   *                                                          *   *
6   *              http://www.access.edu.au                    *   *           Copyright 2003-2007 by ACceSS MNRF
7   *       Primary Business: Queensland, Australia            *   *       Copyright 2007 by University of Queensland
8   *  Licensed under the Open Software License version 3.0    *   *
9   *     http://www.opensource.org/licenses/osl-3.0.php       *   *                http://esscc.uq.edu.au
10   *                                                          *   *        Primary Business: Queensland, Australia
11   ************************************************************   *  Licensed under the Open Software License version 3.0
12  */   *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16  #include "DataArrayView.h"  #include "DataArrayView.h"
17  #include "DataException.h"  #include "DataException.h"
# Line 226  DataArrayView::createShapeErrorMessage(c Line 227  DataArrayView::createShapeErrorMessage(c
227    temp << messagePrefix    temp << messagePrefix
228         << " This shape: " << shapeToString(m_shape)         << " This shape: " << shapeToString(m_shape)
229         << " Other shape: " << shapeToString(other);         << " Other shape: " << shapeToString(other);
230    return string(temp.str());    return temp.str();
231  }  }
232    
233  DataArrayView::ValueType::size_type  DataArrayView::ValueType::size_type
# Line 708  DataArrayView::toString(const string& su Line 709  DataArrayView::toString(const string& su
709        mess << "Error - (toString) Invalid rank: " << getRank();        mess << "Error - (toString) Invalid rank: " << getRank();
710        throw DataException(mess.str());        throw DataException(mess.str());
711      }      }
712      return string(temp.str());      return temp.str();
713  }  }
714    
715  string  string
# Line 723  DataArrayView::shapeToString(const DataA Line 724  DataArrayView::shapeToString(const DataA
724        }        }
725      }      }
726      temp << ")";      temp << ")";
727      return string(temp.str());      return temp.str();
728  }  }
729    
730  void  void

Legend:
Removed from v.1311  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26