[Toon-members] TooN helpers.h internal/config.hh

[Georg Klein]

CVSROOT:        /sources/toon
Module name:    TooN
Changes by:     Georg Klein <gklein>    09/12/03 20:14:49

Modified files:
        .              : helpers.h 
        internal       : config.hh 

Log message:
        Rename min() and max() to min_value(), max_value(). This is to avoid
        conflicts with the min,max macros which are included somewhere in 
windows. 
        
        Also restore config.hh to default state as in config.hh.in

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/helpers.h?cvsroot=toon&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/config.hh?cvsroot=toon&r1=1.17&r2=1.18

Patches:
Index: helpers.h
===================================================================
RCS file: /sources/toon/TooN/helpers.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- helpers.h   2 Nov 2009 17:13:44 -0000       1.85
+++ helpers.h   3 Dec 2009 20:14:48 -0000       1.86
@@ -597,10 +597,11 @@
         };
     }
 
+
        /// Finds the minimal value of a vector.
        /// @param v a vector
        /// @return the smallest value of v
-    template<int Size, typename Precision, typename Base> inline Precision 
min( const Vector<Size, Precision, Base>& v) {
+    template<int Size, typename Precision, typename Base> inline Precision 
min_value( const Vector<Size, Precision, Base>& v) {
         typedef Internal::accumulate_functor_vector<Precision, 
std::less<Precision> > vector_accumulate_functor;
         return Internal::accumulate<Size,Precision,Base,
             vector_accumulate_functor, Precision >( v ); 
@@ -608,15 +609,16 @@
        /// Finds the largest value of a vector.
        /// @param v a vector
        /// @return the largest value of v
-    template<int Size, typename Precision, typename Base> inline Precision 
max( const Vector<Size, Precision, Base>& v) {
+    template<int Size, typename Precision, typename Base> inline Precision 
max_value( const Vector<Size, Precision, Base>& v) {
         typedef Internal::accumulate_functor_vector<Precision, 
std::greater<Precision> > vector_accumulate_functor;
         return Internal::accumulate<Size,Precision,Base,
             vector_accumulate_functor, Precision >( v ); 
     }
+
        /// Finds the smallest value of a matrix.
        /// @param m a matrix
        /// @return the smallest value of m
-    template<int R, int C, typename Precision, typename Base> inline Precision 
min( const Matrix<R, C, Precision, Base> & m) {
+    template<int R, int C, typename Precision, typename Base> inline Precision 
min_value( const Matrix<R, C, Precision, Base> & m) {
         typedef Internal::accumulate_functor_matrix<Precision, 
std::less<Precision> > matrix_accumulate_functor;
         return Internal::accumulate<R,C,Precision,Base,
             matrix_accumulate_functor, Precision>( m );
@@ -624,7 +626,7 @@
        /// Finds the largest value of a matrix.
        /// @param m a matrix
        /// @return the largest value of m
-    template<int R, int C, typename Precision, typename Base> inline Precision 
max( const Matrix<R, C, Precision, Base> & m) {
+    template<int R, int C, typename Precision, typename Base> inline Precision 
max_value( const Matrix<R, C, Precision, Base> & m) {
         typedef Internal::accumulate_functor_matrix<Precision, 
std::greater<Precision> > matrix_accumulate_functor;
         return Internal::accumulate<R,C,Precision,Base,
             matrix_accumulate_functor, Precision>( m );
@@ -632,7 +634,7 @@
        /// Finds the smallest values of each column of a matrix.
        /// @param m a matrix
        /// @return a vector of size C
-    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> min_vertical( const Matrix<R, C, Precision, Base> & 
m) {
+    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> min_value_vertical( const Matrix<R, C, Precision, 
Base> & m) {
         typedef 
Internal::accumulate_vertical_functor<Precision,std::less<Precision> > 
matrix_accumulate_vertical_functor;
         return Internal::accumulate_vertical<R,C,Precision,Base,
             matrix_accumulate_vertical_functor, Vector<Dynamic,Precision> >( m 
);
@@ -640,7 +642,7 @@
        /// Finds the largest values of each column of a matrix.
        /// @param m a matrix
        /// @return a vector of size C
-    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> max_vertical( const Matrix<R, C, Precision, Base> & 
m) {
+    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> max_value_vertical( const Matrix<R, C, Precision, 
Base> & m) {
         typedef 
Internal::accumulate_vertical_functor<Precision,std::greater<Precision> > 
matrix_accumulate_vertical_functor;
         return Internal::accumulate_vertical<R,C,Precision,Base,
             matrix_accumulate_vertical_functor, Vector<Dynamic,Precision> >( m 
);
@@ -648,7 +650,7 @@
        /// Finds the smallest values of each row of a matrix.
        /// @param m a matrix
        /// @return a vector of size R
-    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> min_horizontal( const Matrix<R, C, Precision, Base> & 
m) {
+    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> min_value_horizontal( const Matrix<R, C, Precision, 
Base> & m) {
         typedef 
Internal::accumulate_horizontal_functor<Precision,std::less<Precision> > 
matrix_accumulate_horizontal_functor;
         return Internal::accumulate_horizontal<R,C,Precision,Base,
             matrix_accumulate_horizontal_functor, Vector<Dynamic,Precision> >( 
m );
@@ -656,7 +658,7 @@
        /// Finds the largest values of each row of a matrix.
        /// @param m a matrix
        /// @return a vector of size R
-    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> max_horizontal( const Matrix<R, C, Precision, Base> & 
m) {
+    template<int R, int C, typename Precision, typename Base> inline 
Vector<Dynamic,Precision> max_value_horizontal( const Matrix<R, C, Precision, 
Base> & m) {
         typedef 
Internal::accumulate_horizontal_functor<Precision,std::greater<Precision> > 
matrix_accumulate_horizontal_functor;
         return Internal::accumulate_horizontal<R,C,Precision,Base,
             matrix_accumulate_horizontal_functor, Vector<Dynamic,Precision> >( 
m );

Index: internal/config.hh
===================================================================
RCS file: /sources/toon/TooN/internal/config.hh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- internal/config.hh  19 Nov 2009 18:19:02 -0000      1.17
+++ internal/config.hh  3 Dec 2009 20:14:49 -0000       1.18
@@ -1,14 +1,13 @@
-/* internal/config.hh.  Generated from config.hh.in by configure.  */
-/* #undef TOON_TYPEOF_DECLTYPE */
+#undef TOON_TYPEOF_DECLTYPE
 
-/* #undef TOON_TYPEOF_TYPEOF */
+#undef TOON_TYPEOF_TYPEOF
 
-#define TOON_TYPEOF___TYPEOF__ 1
+#undef TOON_TYPEOF___TYPEOF__
 
-/* #undef TOON_TYPEOF_BOOST */
+#undef TOON_TYPEOF_BOOST
 
-/* #undef TOON_TYPEOF_BUILTIN */
+#undef TOON_TYPEOF_BUILTIN
 
-#define TOON_DEPRECATED_GCC 1
+#undef TOON_DEPRECATED_GCC
 
-#define TOON_USE_LAPACK 1
+#undef TOON_USE_LAPACK