[rkward-cvs] SF.net SVN: rkward:[3166] branches/2010_10_18_backend_restructuring_branch/ rkward/rbackend/rembedinternal.cpp

[tfry at users.sourceforge.net]

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

Log Message:
-----------
Purely cosmetic change.

Modified Paths:
--------------
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.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-31 10:56:06 UTC (rev 3165)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp	2010-10-31 10:57:58 UTC (rev 3166)
@@ -86,13 +86,13 @@
 #endif
 
 void RK_scheduleIntr () {
-	RThread::this_pointer->repl_status.interrupted = true;
+	RThread::repl_status.interrupted = true;
 	RKSignalSupport::callOldSigIntHandler ();
 }
 
 void RK_doIntr () {
 	RK_scheduleIntr ();
-	RThread::this_pointer->repl_status.interrupted = true;
+	RThread::repl_status.interrupted = true;
 	R_CheckUserInterrupt ();
 }
 
@@ -676,14 +676,14 @@
 SEXP doError (SEXP call) {
 	RK_TRACE (RBACKEND);
 
-	if ((RThread::this_pointer->repl_status.eval_depth == 0) && (!RThread::repl_status.in_browser_context) && (!RThread::this_pointer->killed)) {
-		RThread::this_pointer->repl_status.user_command_status = RThread::RKReplStatus::UserCommandFailed;
+	if ((RThread::repl_status.eval_depth == 0) && (!RThread::repl_status.in_browser_context) && (!RThread::this_pointer->killed)) {
+		RThread::repl_status.user_command_status = RThread::RKReplStatus::UserCommandFailed;
 	}
-	if (RThread::this_pointer->repl_status.interrupted) {
+	if (RThread::repl_status.interrupted) {
 		// it is unlikely, but possible, that an interrupt signal was received, but the current command failed for some other reason, before processing was acutally interrupted. In this case, R_interrupts_pending if not yet cleared.
 		// NOTE: if R_interrupts_pending stops being exported one day, we might be able to use R_CheckUserInterrupt() inside an R_ToplevelExec() to find out, whether an interrupt was still pending.
 		if (!R_interrupts_pending) {
-			RThread::this_pointer->repl_status.interrupted = false;
+			RThread::repl_status.interrupted = false;
 			foreach (RCommandProxy *command, RThread::this_pointer->all_current_commands) command->status |= RCommand::Canceled;
 			RK_DO (qDebug ("interrupted"), RBACKEND, DL_DEBUG);
 		}


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