[rkward-cvs] SF.net SVN: rkward:[3196] branches/2010_10_18_backend_restructuring_branch/ rkward/rbackend
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Fri Nov 19 12:42:13 UTC 2010
Revision: 3196
http://rkward.svn.sourceforge.net/rkward/?rev=3196&view=rev
Author: tfry
Date: 2010-11-19 12:42:13 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Fix a few warnings
Modified Paths:
--------------
branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp
branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_backend.cpp
branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.cpp
branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.h
branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp
Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp 2010-11-19 12:37:51 UTC (rev 3195)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rinterface.cpp 2010-11-19 12:42:13 UTC (rev 3196)
@@ -102,7 +102,7 @@
flush_timer->start (FLUSH_INTERVAL);
new RKRBackendProtocolFrontend (this);
- RKRBackendProtocolFrontend::instance ()->setupBackend (QVariantMap ());
+ RKRBackendProtocolFrontend::instance ()->setupBackend ();
}
void RInterface::issueCommand (const QString &command, int type, const QString &rk_equiv, RCommandReceiver *receiver, int flags, RCommandChain *chain) {
Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_backend.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_backend.cpp 2010-11-19 12:37:51 UTC (rev 3195)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_backend.cpp 2010-11-19 12:42:13 UTC (rev 3196)
@@ -127,7 +127,7 @@
}
}
if (servername.isEmpty ()) {
- printf ("no server to connect to");
+ printf ("no server to connect to\n");
return 1;
}
Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.cpp 2010-11-19 12:37:51 UTC (rev 3195)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.cpp 2010-11-19 12:42:13 UTC (rev 3196)
@@ -56,7 +56,7 @@
#endif
}
-void RKRBackendProtocolFrontend::setupBackend (QVariantMap backend_params) {
+void RKRBackendProtocolFrontend::setupBackend () {
RK_TRACE (RBACKEND);
#ifdef RKWARD_THREADED
Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.h
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.h 2010-11-19 12:37:51 UTC (rev 3195)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkrbackendprotocol_frontend.h 2010-11-19 12:42:13 UTC (rev 3196)
@@ -34,7 +34,7 @@
ROutputList flushOutput (bool force);
void interruptProcessing ();
void terminateBackend ();
- void setupBackend (QVariantMap backend_params);
+ void setupBackend ();
static RKRBackendProtocolFrontend* instance () { return _instance; };
protected:
/** needed to handle the QEvents, the R thread is sending (notifications on what's happening in the backend thread) */
Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp 2010-11-19 12:37:51 UTC (rev 3195)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rkstructuregetter.cpp 2010-11-19 12:42:13 UTC (rev 3196)
@@ -309,10 +309,10 @@
}
PROTECT (childnames_s);
QStringList childnames = RKRSupport::SEXPToStringList (childnames_s);
- unsigned int childcount = childnames.size ();
+ int childcount = childnames.size ();
RData::RDataStorage children (childcount, 0);
- for (unsigned int i = 0; i < childcount; ++i) {
+ for (int i = 0; i < childcount; ++i) {
children[i] = new RData (); // NOTE: RData-ctor pre-initalizes these to empty. Thus, we're safe even if there is an error while fetching one of the children.
}
@@ -323,7 +323,7 @@
// For these, Rf_findVar would fail.
REPROTECT (value = RKRSupport::callSimpleFun (as_environment_fun, value, R_GlobalEnv), value_index);
}
- for (unsigned int i = 0; i < childcount; ++i) {
+ for (int i = 0; i < childcount; ++i) {
SEXP current_childname = Rf_install(CHAR(STRING_ELT(childnames_s, i))); // ??? Why does simply using STRING_ELT(childnames_i, i) crash?
PROTECT (current_childname);
SEXP child = Rf_findVar (current_childname, value);
@@ -346,20 +346,20 @@
// see http://sourceforge.net/tracker/?func=detail&aid=3002439&group_id=50231&atid=459007
bool may_be_special = Rf_length (value) < childcount;
if (Rf_isList (value) && (!may_be_special)) { // old style list
- for (unsigned int i = 0; i < childcount; ++i) {
+ for (int i = 0; i < childcount; ++i) {
SEXP child = CAR (value);
getStructureSafe (child, childnames[i], false, children[i]);
CDR (value);
}
} else if (Rf_isNewList (value) && (!may_be_special)) { // new style list
- for (unsigned int i = 0; i < childcount; ++i) {
+ for (int i = 0; i < childcount; ++i) {
SEXP child = VECTOR_ELT(value, i);
getStructureSafe (child, childnames[i], false, children[i]);
}
} else { // probably an S4 object disguised as a list
SEXP index = Rf_allocVector(INTSXP, 1);
PROTECT (index);
- for (unsigned int i = 0; i < childcount; ++i) {
+ for (int i = 0; i < childcount; ++i) {
INTEGER (index)[0] = (i + 1);
SEXP child = RKRSupport::callSimpleFun2 (double_brackets_fun, value, index, R_BaseEnv);
getStructureSafe (child, childnames[i], false, children[i]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list