]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make one of our compilers happy by avoiding a conversion error.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 12 Sep 2005 01:20:51 +0000 (01:20 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 12 Sep 2005 01:20:51 +0000 (01:20 +0000)
git-svn-id: https://svn.dealii.org/trunk@11402 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/utilities.cc

index feafbb211e06f69dd11d5a2000a96539ff6c64a8..2fbac8bfe0aff2f479adec8adf503c8665c56344 100644 (file)
@@ -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] == ' ')

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.