TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename Status enum for avoid conficts on Linux.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-04-06 22:14:19 +02:00
parent 938e28b6f3
commit 4a17d6ceb0
10 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/core/stream/stream.cpp
View file

@ -91,7 +91,7 @@ Stream::Stream()
{
}
const char* Stream::getStatusString(const Status in_status)
const char* Stream::getStatusString(const StreamStatus in_status)
{
switch (in_status) {
case Ok:

10
Engine/source/core/stream/stream.h
View file

@ -57,7 +57,7 @@ class Stream
// Public structs and enumerations...
public:
/// Status constants for the stream
enum Status {
enum StreamStatus {
Ok = 0, ///< Ok!
IOError, ///< Read or Write error
EOS, ///< End of Stream reached (mostly for reads)
@ -74,20 +74,20 @@ public:
// Accessible only through inline accessors
private:
Status m_streamStatus;
StreamStatus m_streamStatus;
// Derived accessible data modifiers...
protected:
void setStatus(const Status in_newStatus) { m_streamStatus = in_newStatus; }
void setStatus(const StreamStatus in_newStatus) { m_streamStatus = in_newStatus; }
public:
Stream();
virtual ~Stream() {}
/// Gets the status of the stream
Stream::Status getStatus() const { return m_streamStatus; }
Stream::StreamStatus getStatus() const { return m_streamStatus; }
/// Gets a printable string form of the status
static const char* getStatusString(const Status in_status);
static const char* getStatusString(const StreamStatus in_status);
// Derived classes must override these...
protected: