Thu Jun 13 14:28:38 2013 UTC ()
There is no portable way to derive vector iterators from pointers, so
just use the pointers directly.


(joerg)
diff -r1.1 -r1.2 pkgsrc/math/R-intervals/distinfo
diff -r0 -r1.1 pkgsrc/math/R-intervals/patches/patch-src_plot__overlap.cpp
diff -r0 -r1.1 pkgsrc/math/R-intervals/patches/patch-src_reduce.cpp
diff -r0 -r1.1 pkgsrc/math/R-intervals/patches/patch-src_which__nearest.cpp
cvs diff -r1.1 -r1.2 pkgsrc/math/R-intervals/distinfo (expand / switch to unified diff)

--- pkgsrc/math/R-intervals/distinfo 2013/01/24 01:26:22 1.1
+++ pkgsrc/math/R-intervals/distinfo 2013/06/13 14:28:38 1.2
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.1 2013/01/24 01:26:22 wen Exp $ 1$NetBSD: distinfo,v 1.2 2013/06/13 14:28:38 joerg Exp $
2 2
3SHA1 (R/intervals_0.13.3.tar.gz) = 21c34a5d869344ad39c433604e9bf27e03be942f 3SHA1 (R/intervals_0.13.3.tar.gz) = 21c34a5d869344ad39c433604e9bf27e03be942f
4RMD160 (R/intervals_0.13.3.tar.gz) = 4254f3db9029d2b6e5f72b57ac0f36bbe6f72651 4RMD160 (R/intervals_0.13.3.tar.gz) = 4254f3db9029d2b6e5f72b57ac0f36bbe6f72651
5Size (R/intervals_0.13.3.tar.gz) = 323247 bytes 5Size (R/intervals_0.13.3.tar.gz) = 323247 bytes
 6SHA1 (patch-src_plot__overlap.cpp) = 1c1e6221eef6ede3e226dc80955f188747e0f762
 7SHA1 (patch-src_reduce.cpp) = 8162b570b6482e9ed1f09b06268f9e1aaee0958c
 8SHA1 (patch-src_which__nearest.cpp) = f7da847cf46a3ab590790b516d33da5d0af558b9
File Added: pkgsrc/math/R-intervals/patches/Attic/patch-src_plot__overlap.cpp
$NetBSD: patch-src_plot__overlap.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $

--- src/plot_overlap.cpp.orig	2013-06-12 19:47:03.000000000 +0000
+++ src/plot_overlap.cpp
@@ -79,7 +79,7 @@ extern "C"
 
     copy( 
 	 y.begin(), y.end(),
-	 std::vector<int>::iterator ( INTEGER( result ) )
+	 INTEGER( result )
 	  );
     
     UNPROTECT(1);
File Added: pkgsrc/math/R-intervals/patches/Attic/patch-src_reduce.cpp
$NetBSD: patch-src_reduce.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $

--- src/reduce.cpp.orig	2013-06-12 19:50:00.000000000 +0000
+++ src/reduce.cpp
@@ -68,22 +68,22 @@ extern "C"
     SET_VECTOR_ELT( result, 0, allocMatrix( REALSXP, start.size(), 2 ) );
     copy( 
 	 start.begin(), start.end(),
-	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) )
+	 REAL( VECTOR_ELT( result, 0 ) )
 	  );
     copy( 
 	 end.begin(), end.end(),
-	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) + start.size() )
+	 REAL( VECTOR_ELT( result, 0 ) ) + start.size()
 	  );
 
     if ( full_bool ) {
       SET_VECTOR_ELT( result, 1, allocMatrix( LGLSXP, start.size(), 2 ) );
       copy( 
     	   start_c.begin(), start_c.end(),
-    	   std::vector<int>::iterator ( LOGICAL( VECTOR_ELT( result, 1 ) ) )
+    	   LOGICAL( VECTOR_ELT( result, 1 ) )
     	    );
       copy( 
     	   end_c.begin(), end_c.end(),
-    	   std::vector<int>::iterator ( LOGICAL( VECTOR_ELT( result, 1 ) ) + start.size() )
+    	   LOGICAL( VECTOR_ELT( result, 1 ) ) + start.size()
     	    );
     }
     else {
File Added: pkgsrc/math/R-intervals/patches/Attic/patch-src_which__nearest.cpp
$NetBSD: patch-src_which__nearest.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $

--- src/which_nearest.cpp.orig	2013-06-12 19:51:17.000000000 +0000
+++ src/which_nearest.cpp
@@ -185,7 +185,7 @@ extern "C"
 
     copy( 
 	 delta.begin(), delta.end(),
-	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) )
+	 REAL( VECTOR_ELT( result, 0 ) )
 	  );
 		    
     for( i = 0; i < tn; i++ ) {      
@@ -195,7 +195,7 @@ extern "C"
 		      );
       copy( 
 	   which[i].begin(), which[i].end(), 
-	   std::vector<int>::iterator ( INTEGER( VECTOR_ELT( VECTOR_ELT( result, 1 ), i ) ) )
+	   INTEGER( VECTOR_ELT( VECTOR_ELT( result, 1 ), i ) )
 	    );
       SET_VECTOR_ELT( 
 		     VECTOR_ELT( result, 2 ), i, 
@@ -203,7 +203,7 @@ extern "C"
 		      );
       copy( 
 	   indices[i].begin(), indices[i].end(), 
-	   std::vector<int>::iterator ( INTEGER( VECTOR_ELT( VECTOR_ELT( result, 2 ), i ) ) )
+	   INTEGER( VECTOR_ELT( VECTOR_ELT( result, 2 ), i ) )
 	    );
     }