[Illumination-commit] SF.net SVN: illumination:[4130] trunk/Illumination/src/Lum

[<tte...@us...>]

Revision: 4130
          http://illumination.svn.sourceforge.net/illumination/?rev=4130&view=rev
Author:   tteuling
Date:     2011-11-01 07:13:01 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Fixed warning/errors in std::min/std::max macros.

Modified Paths:
--------------
    trunk/Illumination/src/Lum/Dlg/File.cpp
    trunk/Illumination/src/Lum/Edit/Text.cpp
    trunk/Illumination/src/Lum/Float.cpp
    trunk/Illumination/src/Lum/String.cpp

Modified: trunk/Illumination/src/Lum/Dlg/File.cpp
===================================================================
--- trunk/Illumination/src/Lum/Dlg/File.cpp	2011-07-09 15:24:58 UTC (rev 4129)
+++ trunk/Illumination/src/Lum/Dlg/File.cpp	2011-11-01 07:13:01 UTC (rev 4130)
@@ -297,7 +297,7 @@
 
       header=new Model::HeaderImpl();
       header->AddColumn(_l(L"MODEL_DIR_FILENAME",L"Filename"),Base::Size::stdCharWidth,15,true);
-      header->AddColumn(_l(L"MODEL_DIR_SIZE",L"Size"),Base::Size::stdCharWidth,std::max(8u,_l(L"MODEL_DIR_DIR",L"(dir)").length()));
+      header->AddColumn(_l(L"MODEL_DIR_SIZE",L"Size"),Base::Size::stdCharWidth,std::max((size_t)8u,_l(L"MODEL_DIR_DIR",L"(dir)").length()));
       header->AddColumn(_l(L"MODEL_DIR_DATE",L"Date"),Base::Size::stdCharWidth,10);
 
       table=new Table();

Modified: trunk/Illumination/src/Lum/Edit/Text.cpp
===================================================================
--- trunk/Illumination/src/Lum/Edit/Text.cpp	2011-07-09 15:24:58 UTC (rev 4129)
+++ trunk/Illumination/src/Lum/Edit/Text.cpp	2011-11-01 07:13:01 UTC (rev 4130)
@@ -610,7 +610,7 @@
         assert(highMark+1==line);
         if (line>=memory.size()) {
           if (memory.size()==0) {
-            memory.resize(std::max(line,10000u));
+            memory.resize(std::max(line,(size_t)10000u));
           }
           else {
             memory.resize(std::max(line,memory.size()*10));

Modified: trunk/Illumination/src/Lum/Float.cpp
===================================================================
--- trunk/Illumination/src/Lum/Float.cpp	2011-07-09 15:24:58 UTC (rev 4129)
+++ trunk/Illumination/src/Lum/Float.cpp	2011-11-01 07:13:01 UTC (rev 4130)
@@ -102,7 +102,7 @@
     unsigned long rows;
 
     if (preferredColumns>0) {
-      columns=std::max(1u,std::min(objects.size(),preferredColumns));
+      columns=std::max((size_t)1u,std::min(objects.size(),preferredColumns));
     }
     else {
       columns=std::max(1l,lround(sqrt(objects.size())));
@@ -213,7 +213,7 @@
   void Float::GetDimension(size_t& width, size_t& height)
   {
     if (preferredColumns>0) {
-      columns=std::max(1u,std::min(objects.size(),preferredColumns));
+      columns=std::max((size_t)1u,std::min(objects.size(),preferredColumns));
     }
     else {
       columns=std::max(1l,lround(sqrt(objects.size())));

Modified: trunk/Illumination/src/Lum/String.cpp
===================================================================
--- trunk/Illumination/src/Lum/String.cpp	2011-07-09 15:24:58 UTC (rev 4129)
+++ trunk/Illumination/src/Lum/String.cpp	2011-11-01 07:13:01 UTC (rev 4130)
@@ -185,7 +185,7 @@
   String::String()
   : textAlign(left),
     baseline(false),
-    visWidth(std::max(20u,OS::display->GetFont()->height*5)),
+    visWidth(std::max((size_t)20u,OS::display->GetFont()->height*5)),
     offset(0),cursor(0),
     markA((size_t)-1),markB((size_t)-1),
     font(OS::display->GetFont()),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.