[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    kspread --enable-final breakage
From:       Ben Burton <bab () debian ! org>
Date:       2003-05-07 8:05:56
[Download RAW message or body]


Hi.  Currently the kspread compile breaks under --enable-final due to
the two (identical) implementations of approx_equal().  The following
patch fixes the compile; does it look okay and if so can it be
committed?

Thanks - Ben.

--- kspread_functions_database.cc	4 May 2003 13:35:37 -0000	1.11
+++ kspread_functions_database.cc	7 May 2003 08:01:29 -0000
@@ -36,6 +36,7 @@
 #include <kspread_interpreter.h>
 #include <kspread_doc.h>
 #include <kspread_functions.h>
+#include <kspread_functions_helper.h>
 #include <kspread_util.h>
 
 #include <qmemarray.h>
@@ -103,6 +104,9 @@ void KSpreadRegisterDatabaseFunctions()
  *
  *********************************************************************/
 
+/**
+ * Use the implementation from kspread_functions_helper.cc instead.
+ *
 static bool approx_equal (double a, double b)
 {
   if ( a == b )
@@ -110,6 +114,7 @@ static bool approx_equal (double a, doub
   double x = a - b;
   return (x < 0.0 ? -x : x)  <  ((a < 0.0 ? -a : a) * DBL_EPSILON);
 }
+ */
 
 void getCond( KSpreadDB::Condition & cond, QString text )
 {
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]