[Toon-members] TooN TooN.h wls.h internal/operators.hh interna...

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Gerhard Reitmayr <gerhard>      11/10/13 22:20:46

Modified files:
        .              : TooN.h wls.h 
        internal       : operators.hh size_mismatch.hh vector.hh 

Log message:
        fixes to make clang++ (LLVM compiler) happy

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/TooN.h?cvsroot=toon&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/TooN/wls.h?cvsroot=toon&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/operators.hh?cvsroot=toon&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/size_mismatch.hh?cvsroot=toon&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/vector.hh?cvsroot=toon&r1=1.56&r2=1.57

Patches:
Index: TooN.h
===================================================================
RCS file: /cvsroot/toon/TooN/TooN.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- TooN.h      19 Apr 2011 09:43:43 -0000      1.62
+++ TooN.h      13 Oct 2011 22:20:46 -0000      1.63
@@ -304,13 +304,14 @@
 #endif
 }
 
+#include <TooN/internal/debug.hh>
+
 #include <TooN/internal/dchecktest.hh>
 #include <TooN/internal/allocator.hh>
 
 #include <TooN/internal/size_mismatch.hh>
 #include <TooN/internal/overfill_error.hh>
 #include <TooN/internal/slice_error.hh>
-#include <TooN/internal/debug.hh>
 
 #include <TooN/internal/comma.hh>
 

Index: wls.h
===================================================================
RCS file: /cvsroot/toon/TooN/wls.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- wls.h       7 Apr 2011 23:17:02 -0000       1.27
+++ wls.h       13 Oct 2011 22:20:46 -0000      1.28
@@ -44,7 +44,7 @@
 /// @param Decomposition The class used to invert the inverse Covariance 
matrix (must have one integer size and one typename precision template 
arguments) this is Cholesky by default, but could also be SQSVD
 /// @ingroup gEquations
 template <int Size=Dynamic, class Precision=DefaultPrecision,
-                 template<int Size, class Precision> class Decomposition = 
Cholesky>
+                 template<int DecompSize, class DecompPrecision> class 
Decomposition = Cholesky>
 class WLS {
 public:
 
@@ -233,8 +233,8 @@
        Vector<Size,Precision> my_mu;
 
        // comment out to allow bitwise copying
-       WLS( WLS& copyof );
-       int operator = ( WLS& copyof );
+       // WLS( WLS& copyof );
+       // int operator = ( WLS& copyof );
 };
 
 }

Index: internal/operators.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/operators.hh,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- internal/operators.hh       29 Jul 2010 18:46:07 -0000      1.50
+++ internal/operators.hh       13 Oct 2011 22:20:46 -0000      1.51
@@ -49,7 +49,7 @@
        template<class L, class R> struct Field
        {       
                ///<Set to 1 if the two classes are in the same field.
-               static const int is = IsField<L>::value && IsField<R>::value;
+               static const int is = IsField<L>::value & IsField<R>::value;
        };
        
 

Index: internal/size_mismatch.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/size_mismatch.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- internal/size_mismatch.hh   7 Sep 2009 11:13:15 -0000       1.6
+++ internal/size_mismatch.hh   13 Oct 2011 22:20:46 -0000      1.7
@@ -83,23 +83,23 @@
   }
 };
 
+#if 0
 namespace Internal
 {
        struct BadSize;
 }
+#endif
 
+#ifdef TOON_TEST_INTERNALS
 template<int Size1, int Size2>
 struct SizeMismatch_
 {
        static inline void test(int, int)
        {
-               #ifdef TOON_TEST_INTERNALS
                        throw Internal::StaticSizeMismatch();
-               #else
-                       Internal::BadSize size_mismatch;
-               #endif
        }
 };
+#endif
 
 template<int Size1, int Size2>
 struct SizeMismatch

Index: internal/vector.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/vector.hh,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- internal/vector.hh  9 Jun 2010 14:21:27 -0000       1.56
+++ internal/vector.hh  13 Oct 2011 22:20:46 -0000      1.57
@@ -170,6 +170,7 @@
   : Base::template VLayout<Size, Precision>(data_in, size_in, stride_in) {}
        
        using Base::template VLayout<Size, Precision>::size;
+       using Base::template VLayout<Size, Precision>::try_destructive_resize;
 
        /// construction from Operator object
        ///