[Genabel-commits] r1344 - in pkg/DatABEL/src: DAlib ITERlib

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

Author: lckarssen
Date: 2013-10-08 00:31:37 +0200 (Tue, 08 Oct 2013)
New Revision: 1344

Added:
   pkg/DatABEL/src/DAlib/Rstuff.h
Removed:
   pkg/DatABEL/src/DAlib/Rstaff.h
Modified:
   pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp
   pkg/DatABEL/src/DAlib/FilteredMatrix_R.cpp
   pkg/DatABEL/src/DAlib/dautil.cpp
   pkg/DatABEL/src/DAlib/dautil.h
   pkg/DatABEL/src/ITERlib/iterator.cpp
   pkg/DatABEL/src/ITERlib/iterator_functions.cpp
Log:
DatABEL: renamed Rstaff.h to Rstuff.h, which makes more sense. 


Modified: pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp
===================================================================
--- pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/DAlib/AbstractMatrix_R.cpp	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,4 +1,4 @@
-#include "Rstaff.h"
+#include "Rstuff.h"
 
 #include "FilteredMatrix.h"
 #include "Logger.h"

Modified: pkg/DatABEL/src/DAlib/FilteredMatrix_R.cpp
===================================================================
--- pkg/DatABEL/src/DAlib/FilteredMatrix_R.cpp	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/DAlib/FilteredMatrix_R.cpp	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,4 +1,4 @@
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include <Rdefines.h>
 
 #include "FilteredMatrix.h"

Deleted: pkg/DatABEL/src/DAlib/Rstaff.h
===================================================================
--- pkg/DatABEL/src/DAlib/Rstaff.h	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/DAlib/Rstaff.h	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,32 +0,0 @@
-#ifndef __RSTAFF_H__
-#define __RSTAFF_H__
-
-#include <string>
-#include <cstring>
-#include <R.h>
-
-
-#include "convert_util.h"
-#include "AbstractMatrix.h"
-#include "FilteredMatrix.h"
-#include "Transposer.h"
-#include "dautil.h"
-
-
-// maximal number of file-matrices allowed
-// #define MAX_FM_OBJECTS 10
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	AbstractMatrix *getAbstractMatrixFromSEXP(SEXP s);
-
-	//check if ptr valid
-    void checkPointer(SEXP s);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

Copied: pkg/DatABEL/src/DAlib/Rstuff.h (from rev 1338, pkg/DatABEL/src/DAlib/Rstaff.h)
===================================================================
--- pkg/DatABEL/src/DAlib/Rstuff.h	                        (rev 0)
+++ pkg/DatABEL/src/DAlib/Rstuff.h	2013-10-07 22:31:37 UTC (rev 1344)
@@ -0,0 +1,32 @@
+#ifndef __RSTUFF_H__
+#define __RSTUFF_H__
+
+#include <string>
+#include <cstring>
+#include <R.h>
+
+
+#include "convert_util.h"
+#include "AbstractMatrix.h"
+#include "FilteredMatrix.h"
+#include "Transposer.h"
+#include "dautil.h"
+
+
+// maximal number of file-matrices allowed
+// #define MAX_FM_OBJECTS 10
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	AbstractMatrix *getAbstractMatrixFromSEXP(SEXP s);
+
+	//check if ptr valid
+    void checkPointer(SEXP s);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Modified: pkg/DatABEL/src/DAlib/dautil.cpp
===================================================================
--- pkg/DatABEL/src/DAlib/dautil.cpp	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/DAlib/dautil.cpp	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,4 +1,4 @@
-//#include "Rstaff.h"
+//#include "Rstuff.h"
 #include <vector>
 #include <string>
 #include <fstream>

Modified: pkg/DatABEL/src/DAlib/dautil.h
===================================================================
--- pkg/DatABEL/src/DAlib/dautil.h	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/DAlib/dautil.h	2013-10-07 22:31:37 UTC (rev 1344)
@@ -3,7 +3,7 @@
 
 #include <Rdefines.h>
 
-#define error_R Rprintf("ERROR in Rstaff:"); Rprintf
+#define error_R Rprintf("ERROR in Rstuff:"); Rprintf
 
 #ifdef __cplusplus
 extern "C" {

Modified: pkg/DatABEL/src/ITERlib/iterator.cpp
===================================================================
--- pkg/DatABEL/src/ITERlib/iterator.cpp	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/ITERlib/iterator.cpp	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,5 +1,5 @@
 #include <cstdarg> 
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include "iterator_functions.h"
 
 

Modified: pkg/DatABEL/src/ITERlib/iterator_functions.cpp
===================================================================
--- pkg/DatABEL/src/ITERlib/iterator_functions.cpp	2013-10-07 22:30:41 UTC (rev 1343)
+++ pkg/DatABEL/src/ITERlib/iterator_functions.cpp	2013-10-07 22:31:37 UTC (rev 1344)
@@ -1,4 +1,4 @@
-#include "Rstaff.h"
+#include "Rstuff.h"
 #include "iterator_functions.h"
 
 #ifdef __cplusplus