octave clang fixes

gistfile1.diff

diff -r 10a5c8155756 liboctave/DiagArray2.h
--- a/liboctave/DiagArray2.h	Tue Nov 08 14:50:15 2011 -0500
+++ b/liboctave/DiagArray2.h	Wed Nov 09 22:19:22 2011 +0100
@@ -43,7 +43,7 @@
 
 public:
 
-  using Array<T>::element_type;
+  using typename Array<T>::element_type;
 
   DiagArray2 (void)
     : Array<T> (), d1 (0), d2 (0) { }
diff -r 10a5c8155756 liboctave/MDiagArray2.h
--- a/liboctave/MDiagArray2.h	Tue Nov 08 14:50:15 2011 -0500
+++ b/liboctave/MDiagArray2.h	Wed Nov 09 22:19:22 2011 +0100
@@ -42,7 +42,7 @@
 {
 public:
 
-  MDiagArray2 (void) : DiagArray2<T> () { }
+  MDiagArray2 (void) : DiagArray2<T>::template DiagArray2<T> () { }
 
   MDiagArray2 (octave_idx_type r, octave_idx_type c) : DiagArray2<T> (r, c) { }
 
diff -r 10a5c8155756 liboctave/intNDArray.h
--- a/liboctave/intNDArray.h	Tue Nov 08 14:50:15 2011 -0500
+++ b/liboctave/intNDArray.h	Wed Nov 09 22:19:22 2011 +0100
@@ -33,8 +33,6 @@
 {
 public:
 
-  using MArray<T>::element_type;
-
   intNDArray (void) : MArray<T> () { }
 
   intNDArray (T val) : MArray<T> (dim_vector (1, 1), val) { }
diff -r 10a5c8155756 liboctave/oct-inttypes.h
--- a/liboctave/oct-inttypes.h	Tue Nov 08 14:50:15 2011 -0500
+++ b/liboctave/oct-inttypes.h	Wed Nov 09 22:19:22 2011 +0100
@@ -47,7 +47,7 @@
 
 // Query for an integer type of certain sizeof, and signedness.
 template<int qsize, bool qsigned>
-struct query_integer_type
+class query_integer_type
 {
 public:
   static const bool registered = false;
@@ -366,7 +366,7 @@
     {
       // Promotion type for multiplication (if exists).
       typedef typename query_integer_type<2*sizeof (T), false>::type mptype;
-      return truncate_int (static_cast<mptype> (x)
+      return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
                            * static_cast<mptype> (y));
     }
 
@@ -621,7 +621,7 @@
     {
       // Promotion type for multiplication (if exists).
       typedef typename query_integer_type<2*sizeof (T), true>::type mptype;
-      return truncate_int (static_cast<mptype> (x)
+      return octave_int_base<T>::truncate_int (static_cast<mptype> (x)
                            * static_cast<mptype> (y));
     }