[Orxonox-commit 1461] r6179 - code/branches/presentation2/src/libraries/core

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Nov 29 21:27:22 CET 2009


Author: rgrieder
Date: 2009-11-29 21:27:22 +0100 (Sun, 29 Nov 2009)
New Revision: 6179

Modified:
   code/branches/presentation2/src/libraries/core/IOConsole.cc
   code/branches/presentation2/src/libraries/core/IOConsole.h
Log:
Fixed Linux build and removed a warning

Modified: code/branches/presentation2/src/libraries/core/IOConsole.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/IOConsole.cc	2009-11-29 20:25:11 UTC (rev 6178)
+++ code/branches/presentation2/src/libraries/core/IOConsole.cc	2009-11-29 20:27:22 UTC (rev 6179)
@@ -403,7 +403,7 @@
     {
         return !this->statusLineWidths_.empty()
              && this->terminalWidth_  >= this->statusLineMaxWidth_
-             && this->terminalHeight_ >= (this->minOutputLines_ + this->statusLineWidths_.size());
+             && this->terminalHeight_ >= this->minOutputLines_ + (int)this->statusLineWidths_.size();
     }
 
     // ###############################

Modified: code/branches/presentation2/src/libraries/core/IOConsole.h
===================================================================
--- code/branches/presentation2/src/libraries/core/IOConsole.h	2009-11-29 20:25:11 UTC (rev 6178)
+++ code/branches/presentation2/src/libraries/core/IOConsole.h	2009-11-29 20:27:22 UTC (rev 6179)
@@ -93,7 +93,7 @@
         bool                    bStatusPrinted_;
         std::vector<int>        statusLineWidths_;
         int                     statusLineMaxWidth_;
-        static const            minOutputLines_ = 3;
+        static const int        minOutputLines_ = 3;
         termios*                originalTerminalSettings_;
 
 #elif defined(ORXONOX_PLATFORM_WINDOWS)




More information about the Orxonox-commit mailing list