Simplify the kludge with member templates etc.

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

diff --git a/deal.II/deal.II/source/numerics/histogram.cc b/deal.II/deal.II/source/numerics/histogram.cc
index fa6f7a0337cfa82cfbb2d13ee9f583d556939b47..510153d01bec55666540dcd7f7590a2dc4441832 100644 (file)
--- a/deal.II/deal.II/source/numerics/histogram.cc
+++ b/deal.II/deal.II/source/numerics/histogram.cc
@@ -70,82 +70,67 @@ void Histogram::evaluate (const typename std::vector<Vector<number> > &values,
   switch (interval_spacing)
     {
       case linear:
-           min_value = *std::min_element(values[0].begin(),
-                                    values[0].end());
-           max_value = *std::max_element(values[0].begin(),
-                                    values[0].end());
-
-           for (unsigned int i=1; i<values.size(); ++i)
-             {
-               min_value = std::min (min_value,
-                                *std::min_element(values[i].begin(),
-                                             values[i].end()));
-               max_value = std::max (max_value,
-                                *std::max_element(values[i].begin(),
-                                             values[i].end()));
-             };
-           
-           break;
-           
+      {
+       min_value = *std::min_element(values[0].begin(),
+                                     values[0].end());
+       max_value = *std::max_element(values[0].begin(),
+                                     values[0].end());
+       
+       for (unsigned int i=1; i<values.size(); ++i)
+         {
+           min_value = std::min (min_value,
+                                 *std::min_element(values[i].begin(),
+                                                   values[i].end()));
+           max_value = std::max (max_value,
+                                 *std::max_element(values[i].begin(),
+                                                   values[i].end()));
+         };
+       
+       break;
+      };
+       
       case logarithmic:
-           min_value = *std::min_element(values[0].begin(),
-                                         values[0].end(),
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                    &logarithmic_less<number>
-#else
-                                    &Histogram::template logarithmic_less<number>
-#endif
-           );
-           
-           max_value = *std::max_element(values[0].begin(),
-                                    values[0].end(),
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                    &logarithmic_less<number>
-#else
-                                    &Histogram::template logarithmic_less<number>
-#endif
-           );
-
-
-           for (unsigned int i=1; i<values.size(); ++i)
-             {
-               min_value = std::min (min_value,
-                                *std::min_element(values[i].begin(),
-                                             values[i].end(),
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                             &logarithmic_less<number>
-#else
-                                             &Histogram::template logarithmic_less<number>
-#endif
-                                ),
-
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                &logarithmic_less<number>
-#else
-                                &Histogram::template logarithmic_less<number>
-#endif
-               );
-
-               max_value = std::max (max_value,
-                                *std::max_element(values[i].begin(),
-                                             values[i].end(),
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                             &logarithmic_less<number>
+      {
+       typedef bool (*comparator) (const number, const number);
+       const comparator logarithmic_less_function
+         =
+#ifdef __GNU_CC
+#if (__GNUC__==2) && (__GNUC_MINOR__ < 95)
+         &logarithmic_less<number>
 #else
-                                             &Histogram::template logarithmic_less<number>
+         &Histogram::template logarithmic_less<number>
 #endif
-                                ),
-
-#if (__GNUC__-0==2) && (__GNUC_MINOR__-0 < 95)
-                                &logarithmic_less<number>
 #else
-                                &Histogram::template logarithmic_less<number>
+         &Histogram::template logarithmic_less<number>   
 #endif
-               );
-             };
+         ;
+       
+       min_value = *std::min_element(values[0].begin(),
+                                     values[0].end(),
+                                     logarithmic_less_function);
+       
+       max_value = *std::max_element(values[0].begin(),
+                                     values[0].end(),
+                                     logarithmic_less_function);
+       
+       for (unsigned int i=1; i<values.size(); ++i)
+         {
+           min_value = std::min (min_value,
+                                 *std::min_element(values[i].begin(),
+                                                   values[i].end(),
+                                                   logarithmic_less_function),
+                                 logarithmic_less_function);
            
-           break;
-
+           max_value = std::max (max_value,
+                                 *std::max_element(values[i].begin(),
+                                                   values[i].end(),
+                                                   logarithmic_less_function),
+                                 logarithmic_less_function);
+         };
+       
+       break;
+      };
+       
       default:
            Assert (false, ExcInternalError());
     };