[Ptinpoly-commits] r25 - pkg/src

[noreply at r-forge.r-project.org]

Author: jmaisog
Date: 2014-05-06 13:41:48 +0200 (Tue, 06 May 2014)
New Revision: 25

Modified:
   pkg/src/kodtree.cc
   pkg/src/kodtree.h
   pkg/src/pinpolyhedronA.cc
Log:


Modified: pkg/src/kodtree.cc
===================================================================
--- pkg/src/kodtree.cc	2014-05-05 12:47:58 UTC (rev 24)
+++ pkg/src/kodtree.cc	2014-05-06 11:41:48 UTC (rev 25)
@@ -3,7 +3,7 @@
 #include <queue>
 #include <math.h>
 typedef double Point[3];
-extern void jf_error(char *ch);
+// extern void jf_error(char *ch); Already declared in kodtree.h
 extern bool ifBoxContainPoint( Point p,const Box &bound,const Box &rootbound);
 extern bool if2BoxOverlap(const Box &a,const Box &b);
 extern bool if2BoxNeighb(const Box &a,const Box &b);
@@ -521,7 +521,7 @@
 	pto[2]=pfr[2];
 }
 
-void jf_error(char *ch){
+void jf_error(const char *ch){
 
 		Rprintf("%s\n",ch);
 		throw(8);

Modified: pkg/src/kodtree.h
===================================================================
--- pkg/src/kodtree.h	2014-05-05 12:47:58 UTC (rev 24)
+++ pkg/src/kodtree.h	2014-05-06 11:41:48 UTC (rev 25)
@@ -129,7 +129,7 @@
 	bool isLeaf(){ return !child[0];}
 };
  
-extern void jf_error(char *ch);
+extern void jf_error(const char *ch);
 extern bool ifBoxContainPoint( Point p,const Box &bound,const Box &rootbound);
 extern bool if2BoxOverlap(const Box &a,const Box &b);
 extern bool if2BoxNeighb(const Box &a,const Box &b);

Modified: pkg/src/pinpolyhedronA.cc
===================================================================
--- pkg/src/pinpolyhedronA.cc	2014-05-05 12:47:58 UTC (rev 24)
+++ pkg/src/pinpolyhedronA.cc	2014-05-06 11:41:48 UTC (rev 25)
@@ -19,7 +19,7 @@
 #include <float.h> // For DBL_MAX
 
 #include "pinpolyhedron.h"
-extern  void jf_error(char *);
+extern  void jf_error(const char *);
 using namespace std;
 
 const double PointInPolyhedron::epsilonon=0.00000000000001;