[cig-commits] r13049 - in cs/cigma/trunk/src/contrib/ann: include/ANN src

[luis at geodynamics.org]

Author: luis
Date: 2008-10-15 02:07:46 -0700 (Wed, 15 Oct 2008)
New Revision: 13049

Modified:
   cs/cigma/trunk/src/contrib/ann/include/ANN/ANN.h
   cs/cigma/trunk/src/contrib/ann/include/ANN/ANNx.h
   cs/cigma/trunk/src/contrib/ann/src/ANN.cpp
   cs/cigma/trunk/src/contrib/ann/src/kd_dump.cpp
   cs/cigma/trunk/src/contrib/ann/src/perf.cpp
Log:
Fix errors and warnings in ANN that were revealed by GCC 4.3

Modified: cs/cigma/trunk/src/contrib/ann/include/ANN/ANN.h
===================================================================
--- cs/cigma/trunk/src/contrib/ann/include/ANN/ANN.h	2008-10-15 09:07:45 UTC (rev 13048)
+++ cs/cigma/trunk/src/contrib/ann/include/ANN/ANN.h	2008-10-15 09:07:46 UTC (rev 13049)
@@ -89,6 +89,7 @@
 
 #include <cmath>			// math includes
 #include <iostream>			// I/O streams
+#include <cstdlib>          // C standard library
 
 //----------------------------------------------------------------------
 // Limits

Modified: cs/cigma/trunk/src/contrib/ann/include/ANN/ANNx.h
===================================================================
--- cs/cigma/trunk/src/contrib/ann/include/ANN/ANNx.h	2008-10-15 09:07:45 UTC (rev 13048)
+++ cs/cigma/trunk/src/contrib/ann/include/ANN/ANNx.h	2008-10-15 09:07:46 UTC (rev 13049)
@@ -61,7 +61,7 @@
 //----------------------------------------------------------------------
 
 void annError(					// ANN error routine
-	char			*msg,		// error message
+	const char		*msg,		// error message
 	ANNerr			level);		// level of error
 
 void annPrintPt(				// print a point

Modified: cs/cigma/trunk/src/contrib/ann/src/ANN.cpp
===================================================================
--- cs/cigma/trunk/src/contrib/ann/src/ANN.cpp	2008-10-15 09:07:45 UTC (rev 13048)
+++ cs/cigma/trunk/src/contrib/ann/src/ANN.cpp	2008-10-15 09:07:46 UTC (rev 13049)
@@ -163,7 +163,7 @@
 //	Error handler
 //----------------------------------------------------------------------
 
-void annError(char *msg, ANNerr level)
+void annError(const char *msg, ANNerr level)
 {
 	if (level == ANNabort) {
 		cerr << "ANN: ERROR------->" << msg << "<-------------ERROR\n";

Modified: cs/cigma/trunk/src/contrib/ann/src/kd_dump.cpp
===================================================================
--- cs/cigma/trunk/src/contrib/ann/src/kd_dump.cpp	2008-10-15 09:07:45 UTC (rev 13048)
+++ cs/cigma/trunk/src/contrib/ann/src/kd_dump.cpp	2008-10-15 09:07:46 UTC (rev 13049)
@@ -33,6 +33,7 @@
 
 #include "kd_tree.h"					// kd-tree declarations
 #include "bd_tree.h"					// bd-tree declarations
+#include <cstring>                      // C string library
 
 using namespace std;					// make std:: available
 

Modified: cs/cigma/trunk/src/contrib/ann/src/perf.cpp
===================================================================
--- cs/cigma/trunk/src/contrib/ann/src/perf.cpp	2008-10-15 09:07:45 UTC (rev 13048)
+++ cs/cigma/trunk/src/contrib/ann/src/perf.cpp	2008-10-15 09:07:46 UTC (rev 13049)
@@ -102,7 +102,7 @@
 }
 
 										// print a single statistic
-void print_one_stat(char *title, ANNsampStat s, double div)
+void print_one_stat(const char *title, ANNsampStat s, double div)
 {
 	cout << title << "= [ ";
 	cout.width(9); cout << s.mean()/div			<< " : ";