** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: array2dfile.cpp,v 1.17 2000/12/14 20:59:30 kevin Exp $
+** $Id: array2dfile.cpp,v 1.20 2000/12/16 02:44:26 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
}
void
-Array2dFileLabel::print (ostream& os) const
+Array2dFileLabel::print (std::ostream& os) const
{
if (m_labelType == L_HISTORY) {
os << "History: " << endl;
Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const pszId)
{
string id;
- if (idStr)
+ if (pszId)
id = pszId;
for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) {
Array2dFileLabel l (copyFile.labelGet (i));
string lstr = l.getLabelString();
- lstr = idStr + lstr;
+ lstr = id + lstr;
l.setLabelString (lstr);
labelAdd (l);
}