[Toon-members] TooN TooN.h configure configure.ac helpers.h in...

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/05/13 13:43:44

Modified files:
        .              : TooN.h configure configure.ac helpers.h 
        internal       : config.hh config.hh.in 

Log message:
        Deprecated TooN::Fill in favour of Ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/TooN.h?cvsroot=toon&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/TooN/configure?cvsroot=toon&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/TooN/configure.ac?cvsroot=toon&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/TooN/helpers.h?cvsroot=toon&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/config.hh?cvsroot=toon&rev=1.9
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/config.hh.in?cvsroot=toon&r1=1.1&r2=1.2

Patches:
Index: TooN.h
===================================================================
RCS file: /cvsroot/toon/TooN/TooN.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- TooN.h      6 May 2009 14:51:16 -0000       1.40
+++ TooN.h      13 May 2009 13:43:44 -0000      1.41
@@ -37,6 +37,7 @@
 #include <new>
 #include <TooN/internal/config.hh>
 #include <TooN/internal/typeof.hh>
+#include <TooN/internal/deprecated.hh>
 
 #ifdef TOON_INITIALIZE_RANDOM
 #include <ctime>

Index: configure
===================================================================
RCS file: /cvsroot/toon/TooN/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- configure   14 Apr 2009 12:57:30 -0000      1.4
+++ configure   13 May 2009 13:43:44 -0000      1.5
@@ -2476,6 +2476,50 @@
 
 fi
 
+{ echo "$as_me:$LINENO: checking for __attribute__((deprecated))" >&5
+echo $ECHO_N "checking for __attribute__((deprecated))... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+
+__attribute__((deprecated)) void foo(){}
+int main()
+{
+       foo();
+}
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };cat >>confdefs.h <<\_ACEOF
+#define TOON_DEPRECATED_GCC 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 
 cat<<FOO
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/toon/TooN/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- configure.ac        14 Apr 2009 12:57:30 -0000      1.4
+++ configure.ac        13 May 2009 13:43:44 -0000      1.5
@@ -39,6 +39,16 @@
        AC_DEFINE(TOON_TYPEOF_BOOST, 1)
 fi
 
+AC_MSG_CHECKING([for __attribute__((deprecated))])
+AC_COMPILE_IFELSE([
+__attribute__((deprecated)) void foo(){}
+int main()
+{
+       foo();
+}
+], [ AC_MSG_RESULT(yes);AC_DEFINE(TOON_DEPRECATED_GCC,1 )], AC_MSG_RESULT(no))
+
+
 
 cat<<FOO
 

Index: helpers.h
===================================================================
RCS file: /cvsroot/toon/TooN/helpers.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- helpers.h   6 May 2009 14:55:44 -0000       1.65
+++ helpers.h   13 May 2009 13:43:44 -0000      1.66
@@ -43,13 +43,13 @@
 namespace TooN {
 
 
-       template<int Size, class Precision, class Base> void Fill(Vector<Size, 
Precision, Base>& v, const Precision& p)
+       template<int Size, class Precision, class Base> TOON_DEPRECATED void 
Fill(Vector<Size, Precision, Base>& v, const Precision& p)
        {
                for(int i=0; i < v.size(); i++)
                        v[i]= p;
        }
 
-       template<int Rows, int Cols, class Precision, class Base> void 
Fill(Matrix<Rows, Cols, Precision, Base>& m, const Precision& p)
+       template<int Rows, int Cols, class Precision, class Base> 
TOON_DEPRECATED void Fill(Matrix<Rows, Cols, Precision, Base>& m, const 
Precision& p)
        {
                for(int i=0; i < m.num_rows(); i++)
                        for(int j=0; j < m.num_cols(); j++)

Index: internal/config.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/config.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- internal/config.hh  6 May 2009 14:58:54 -0000       1.8
+++ internal/config.hh  13 May 2009 13:43:44 -0000      1.9
@@ -1 +0,0 @@
-

Index: internal/config.hh.in
===================================================================
RCS file: /cvsroot/toon/TooN/internal/config.hh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- internal/config.hh.in       27 Feb 2009 14:28:08 -0000      1.1
+++ internal/config.hh.in       13 May 2009 13:43:44 -0000      1.2
@@ -8,5 +8,4 @@
 
 #undef TOON_TYPEOF_BUILTIN
 
-#undef PACKAGE_VERSION
-
+#undef TOON_DEPRECATED_GCC