Windows compilation fixes

[libs/core.git] / source / io / console.cpp

diff --git a/source/io/console.cpp b/source/io/console.cpp
index 259f80fbdf5ca21802099d9108c779f1bb9c0f53..c846604806aa66e36ea8ce76d37199b7420b4372 100644 (file)
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -14,13 +14,13 @@ using namespace std;
 namespace {
 
 #ifdef WIN32
 namespace {
 
 #ifdef WIN32

-DWORD stream_to_sys(Console::Stream stream)
+DWORD stream_to_sys(Msp::IO::Console::Stream stream)

 {
        switch(stream)
        {
 {
        switch(stream)
        {

-       case INPUT: return STD_INPUT_HANDLE;
-       case OUTPUT: return STD_OUTPUT_HANDLE;
-       case ERROR: return STD_ERROR_HANDLE;
+       case Msp::IO::Console::CIN: return STD_INPUT_HANDLE;
+       case Msp::IO::Console::COUT: return STD_OUTPUT_HANDLE;
+       case Msp::IO::Console::CERR: return STD_ERROR_HANDLE;

        default: throw invalid_argument("stream_to_sys");
        }
 }
        default: throw invalid_argument("stream_to_sys");
        }
 }


@@ -37,25 +37,25 @@ namespace IO {
 Console::Console(Stream s):
        stream(s)
 {
 Console::Console(Stream s):
        stream(s)
 {

-       mode = (stream==INPUT ? M_READ : M_WRITE);
+       mode = (stream==CIN ? M_READ : M_WRITE);

 
 #ifdef WIN32
        *handle = GetStdHandle(stream_to_sys(stream));
 #else
        *handle = stream;
 
 
 #ifdef WIN32
        *handle = GetStdHandle(stream_to_sys(stream));
 #else
        *handle = stream;
 

-       if(stream==INPUT)
+       if(stream==CIN)

                tcgetattr(*handle, &orig_attr);
 #endif
 
                tcgetattr(*handle, &orig_attr);
 #endif
 

-       if(stream==INPUT)
+       if(stream==CIN)

                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32
                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32

-       if(stream==INPUT)
+       if(stream==CIN)

                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }


@@ -156,23 +156,23 @@ unsigned Console::do_read(char *buf, unsigned len)
 
 Console &Console::instance(Stream s)
 {
 
 Console &Console::instance(Stream s)
 {

-       static Console in(INPUT);
-       static Console out(OUTPUT);
-       static Console err(ERROR);
+       static Console in(CIN);
+       static Console out(COUT);
+       static Console err(CERR);

 
        switch(s)
        {
 
        switch(s)
        {

-       case INPUT: return in;
-       case OUTPUT: return out;
-       case ERROR: return err;
+       case CIN: return in;
+       case COUT: return out;
+       case CERR: return err;

        }
 
        throw invalid_argument("Console::instance");
 }
 
        }
 
        throw invalid_argument("Console::instance");
 }
 

-Console &cin = Console::instance(Console::INPUT);
-Console &cout = Console::instance(Console::OUTPUT);
-Console &cerr = Console::instance(Console::ERROR);
+Console &cin = Console::instance(Console::CIN);
+Console &cout = Console::instance(Console::COUT);
+Console &cerr = Console::instance(Console::CERR);

 
 } // namespace IO
 } // namespace Msp
 
 } // namespace IO
 } // namespace Msp