From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 12 Sep 2005 01:20:51 +0000 (+0000)
Subject: Make one of our compilers happy by avoiding a conversion error.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=445a84fb749d6c66482fc722f22a8d7dbb2c0057;p=dealii-svn.git

Make one of our compilers happy by avoiding a conversion error.


git-svn-id: https://svn.dealii.org/trunk@11402 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/base/source/utilities.cc b/deal.II/base/source/utilities.cc
index feafbb211e..2fbac8bfe0 100644
--- a/deal.II/base/source/utilities.cc
+++ b/deal.II/base/source/utilities.cc
@@ -211,7 +211,7 @@ namespace Utilities
                                              // starting at position width, find the
                                              // location of the previous space, so
                                              // that we can break around there
-            int location = std::min(width,text.length()-1);
+            int location = std::min<int>(width,text.length()-1);
             for (; location>=0; --location)
               if (text[location] == ' ')
                 break;
@@ -219,7 +219,7 @@ namespace Utilities
                                              // if there are no spaces, then try if
                                              // there are spaces coming up
             if (location == 0)
-              for (location = std::min(width,text.length()-1);
+              for (location = std::min<int>(width,text.length()-1);
                    location<static_cast<int>(text.length());
                    ++location)
                 if (text[location] == ' ')