Merge pull request #600 from BeamNG/rename_Status

Rename Status enum for avoid conficts on Linux.
This commit is contained in:
Daniel Buckmaster 2014-05-10 11:01:28 +10:00
commit f69eccfdb4
10 changed files with 43 additions and 43 deletions

View file

@ -55,7 +55,7 @@ public:
}
virtual Path getName() const { return mZipFilename; }
virtual Status getStatus() const
virtual NodeStatus getStatus() const
{
if (mZipStream)
{
@ -182,7 +182,7 @@ public:
Torque::Path getName() const { return mPath; }
// getStatus() doesn't appear to be used for directories
Status getStatus() const
NodeStatus getStatus() const
{
return FileNode::Open;
}
@ -274,7 +274,7 @@ public:
Torque::Path getName() const { return mPath; }
// getStatus() doesn't appear to be used for directories
Status getStatus() const
NodeStatus getStatus() const
{
return FileNode::Open;
}