Skip to content

Commit

Permalink
Merge pull request #26 from usbr/add-missing-include
Browse files Browse the repository at this point in the history
Add missing include of iostream in FileList.h
  • Loading branch information
dloney authored Mar 15, 2021
2 parents 3bb41e9 + 5c4745b commit 11630fa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@
*.exe
*.out
*.app
make/Ostrich

# MacOS files
**.DS_Store
7 changes: 2 additions & 5 deletions include/FileList.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Author : L. Shawn Matott
Copyright: 2008, L. Shawn Matott
FileList classes are used to store a collection of files that Ostrich needs to
delete when its done running. These files are executables and and extra input
delete when its done running. These files are executables and and extra input
files. Files are deleted to conserve disk space, which is required for large
parallel runs.
Expand Down Expand Up @@ -34,10 +34,7 @@ class FileList

private:
char m_Name[DEF_STR_SZ];
FileList * m_pNxt;
FileList * m_pNxt;
}; /* end class FileList */

#endif /* FILE_LIST_H */



11 changes: 5 additions & 6 deletions src/FileList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Author : L. Shawn Matott
Copyright: 2008, L. Shawn Matott
FileList classes are used to store a collection of files that Ostrich needs to
delete when its done running. These files are executables and and extra input
delete when its done running. These files are executables and and extra input
files. Files are deleted to conserve disk space, which is required for large
parallel runs.
Expand All @@ -25,8 +25,8 @@ Creates a file list.
******************************************************************************/
FileList::FileList(IroncladString name)
{
strcpy(m_Name, name);
m_pNxt = NULL;
strcpy(m_Name, name);
m_pNxt = NULL;
IncCtorCount();
} /* end CTOR */

Expand All @@ -36,7 +36,7 @@ Destroy()
Frees up the file list.
******************************************************************************/
void FileList::Destroy(void)
{
{
delete m_pNxt;
IncDtorCount();
}/* end Destroy() */
Expand Down Expand Up @@ -86,7 +86,7 @@ void FileList::Cleanup(IroncladString dir, const char* dirName, int rank)
sprintf(tmp, "rm %s 2>&1 | >> %s", pCur->GetName(), GetOstExeOut());
#endif
system(tmp);

sprintf(tmp, "Ostrich deleted %s/%s", dir, pCur->GetName());
LogError(ERR_CLEANUP, tmp);
}/* end if(file exists) */
Expand All @@ -95,7 +95,6 @@ void FileList::Cleanup(IroncladString dir, const char* dirName, int rank)
sprintf(tmp, "..\\..\\..\\%s%d", dirName, rank);
#else
sprintf(tmp, "../../../%s%d", dirName, rank);
std::cout << tmp << std::endl;
#endif
MY_CHDIR(tmp);
}/* end Cleanup() */

0 comments on commit 11630fa

Please sign in to comment.