** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: array2dfile.cpp,v 1.16 2000/12/06 15:17:51 kevin Exp $
+** $Id: array2dfile.cpp,v 1.21 2000/12/16 06:12:47 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
typedef long off_t;\r
#endif
-using namespace std;
const kuint16 Array2dFile::m_signature = ('I'*256+'F');
second = m_second;
}
-const string&
+const std::string&
Array2dFileLabel::getDateString (void) const
{
char szDate [128];\r
}
void
-Array2dFileLabel::print (ostream& os) const
+Array2dFileLabel::print (std::ostream& os) const
{
if (m_labelType == L_HISTORY) {
- os << "History: " << endl;
- os << " " << m_strLabel << endl;
- os << " calc time = " << m_calcTime << " secs" << endl;
- os << " Timestamp = " << getDateString() << endl;
+ os << "History: " << std::endl;
+ os << " " << m_strLabel << std::endl;
+ os << " calc time = " << m_calcTime << " secs" << std::endl;
+ os << " Timestamp = " << getDateString() << std::endl;
} else if (m_labelType == L_USER) {
- os << "Note: " << m_strLabel << endl;
- os << " Timestamp = %s" << getDateString() << endl;
+ os << "Note: " << m_strLabel << std::endl;
+ os << " Timestamp = %s" << getDateString() << std::endl;
} else {
- os << "Unknown (" << m_labelType << "): " << m_strLabel << endl;
- os << " Timestamp = %s" << getDateString() << endl;
+ os << "Unknown (" << m_labelType << "): " << m_strLabel << std::endl;
+ os << " Timestamp = %s" << getDateString() << std::endl;
}
}
}
bool
-Array2dFile::fileWrite (const string& filename)
+Array2dFile::fileWrite (const std::string& filename)
{
return fileWrite (filename.c_str());
}
{
m_filename = filename;
- frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::trunc | ios::binary);
+ frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::trunc | std::ios::binary);
if (fs.fail()) {
sys_error (ERR_WARNING, "Error opening file %s for writing [fileCreate]", m_filename.c_str());
return false;
}
bool
-Array2dFile::fileRead (const string& filename)
+Array2dFile::fileRead (const std::string& filename)
{
return fileRead (filename.c_str());
}
m_filename = filename;
#ifdef MSVC\r
- frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary);\r
+ frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::binary);\r
#else\r
- frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);\r
+ frnetorderstream fs (m_filename.c_str(), std::ios::out | std::ios::in | std::ios::binary | std::ios::nocreate);\r
#endif\r
if (fs.fail()) {
sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
}
void
-Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
+Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const pszId)
{
- string id = idStr;
+ std::string id;
+ 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;
+ std::string lstr = l.getLabelString();
+ lstr = id + lstr;
l.setLabelString (lstr);
labelAdd (l);
}
}
void
-Array2dFile::printLabels (ostream& os) const
+Array2dFile::printLabels (std::ostream& os) const
{
for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {
const Array2dFileLabel& label = **l;
label.print (os);
- os << endl;
+ os << std::endl;
}
}