[rkward-cvs] SF.net SVN: rkward:[3165] branches/2010_10_18_backend_restructuring_branch/ rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 3165
          http://rkward.svn.sourceforge.net/rkward/?rev=3165&view=rev
Author:   tfry
Date:     2010-10-31 10:56:06 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
Finally build rkstructuregetter in a sane way.

Modified Paths:
--------------
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/CMakeLists.txt
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.h

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/CMakeLists.txt
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/CMakeLists.txt	2010-10-30 11:01:19 UTC (rev 3164)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/CMakeLists.txt	2010-10-31 10:56:06 UTC (rev 3165)
@@ -23,6 +23,7 @@
 	rksignalsupport.cpp
 	rklocalesupport.cpp
 	rkrsupport.cpp
+	rkstructuregetter.cpp
 )
 
 

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp	2010-10-30 11:01:19 UTC (rev 3164)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp	2010-10-31 10:56:06 UTC (rev 3165)
@@ -31,6 +31,7 @@
 #include "../debug.h"
 
 #include "rkrsupport.h"
+#include "rkstructuregetter.h"
 #include "rinterface.h"
 #include "rklocalesupport.h"
 #include "rkpthreadsupport.h"
@@ -748,8 +749,6 @@
 	return res;
 }
 
-#include "rkstructuregetter.cpp"
-
 SEXP doGetStructure (SEXP toplevel, SEXP name, SEXP envlevel, SEXP namespacename) {
 	RK_TRACE (RBACKEND);
 

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp	2010-10-30 11:01:19 UTC (rev 3164)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp	2010-10-31 10:56:06 UTC (rev 3165)
@@ -17,6 +17,12 @@
 
 #include "rkstructuregetter.h"
 
+#include "rdata.h"
+#include "rkrsupport.h"
+#include "../core/robject.h"
+
+#include "../debug.h"
+
 RKStructureGetter::RKStructureGetter (bool keep_evalled_promises) {
 	RK_TRACE (RBACKEND);
 

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.h
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.h	2010-10-30 11:01:19 UTC (rev 3164)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.h	2010-10-31 10:56:06 UTC (rev 3165)
@@ -2,7 +2,7 @@
                           rkstructuregetter  -  description
                              -------------------
     begin                : Wed Apr 11 2007
-    copyright            : (C) 2007, 2009 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009, 2010 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -18,6 +18,12 @@
 #ifndef RKSTRUCTUREGETTER_H
 #define RKSTRUCTUREGETTER_H
 
+#include <Rinternals.h>
+
+#include <QString>
+
+class RData;
+
 /** Low level helper class for getting the structure of R objects (.rk.get.structure).
 Since this is only used from REmbedInternal, and making Qt and R includes cooperate is so much trouble,
 this is designed to be included directly in rembedinternal.cpp, i.e. includes are not properly defined. I'll fix that later. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.