# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1204658332 18000
# Node ID ff9c2bb7abc71200337983e7626c3ab440dbecdb
# Parent  9cbf1e2011a3db20aa66b159c7ab3d92c10a4c83
workaround to enable compiling with Intel C++ 10.1

diff -r 9cbf1e2011a3 -r ff9c2bb7abc7 liboctave/Array-C.cc
--- a/liboctave/Array-C.cc	Tue Mar 04 14:16:16 2008 -0500
+++ b/liboctave/Array-C.cc	Tue Mar 04 14:18:52 2008 -0500
@@ -31,7 +31,6 @@
 
 #include "Array.h"
 #include "Array.cc"
-#include "oct-sort.cc"
 
 static double
 xabs (const Complex& x)
@@ -53,6 +52,10 @@
 	  || ((xabs (a) == xabs (b)) && (arg (a) > arg (b))));
 }
 
+// This file must be included after the < and > operators are
+// defined to avoid errors with the Intel C++ compiler.
+#include "oct-sort.cc"
+
 template <>
 bool
 ascending_compare (Complex a, Complex b)
diff -r 9cbf1e2011a3 -r ff9c2bb7abc7 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Tue Mar 04 14:16:16 2008 -0500
+++ b/liboctave/ChangeLog	Tue Mar 04 14:18:52 2008 -0500
@@ -1,3 +1,8 @@
+2008-03-04  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array-C.cc, Sparse-C.cc: Include oct-sort.cc after definitions
+	of < and > operators.
+
 2008-03-03  David Bateman  <dbateman@free.fr>
 
 	* Sparse.cc (assign1, assign1): Take care of repeated index
diff -r 9cbf1e2011a3 -r ff9c2bb7abc7 liboctave/Sparse-C.cc
--- a/liboctave/Sparse-C.cc	Tue Mar 04 14:16:16 2008 -0500
+++ b/liboctave/Sparse-C.cc	Tue Mar 04 14:18:52 2008 -0500
@@ -33,7 +33,6 @@
 #include "Sparse.h"
 #include "Sparse.cc"
 
-#include "oct-sort.cc"
 
 static double
 xabs (const Complex& x)
@@ -55,6 +54,10 @@
 	  || ((xabs (a) == xabs (b)) && (arg (a) > arg (b))));
 }
 
+// This file must be included after the < and > operators are
+// defined to avoid errors with the Intel C++ compiler.
+#include "oct-sort.cc"
+
 template <>
 bool
 sparse_ascending_compare (Complex a, Complex b)