[rkward-cvs] rkward/rkward/rbackend rembedinternal.cpp,1.29,1.30

Thomas Friedrichsmeier tfry at users.sourceforge.net
Fri Nov 4 13:31:02 UTC 2005


Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25358/rkward/rbackend

Modified Files:
	rembedinternal.cpp 
Log Message:
Disabled unsafe output flushes from R

Index: rembedinternal.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rembedinternal.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** rembedinternal.cpp	3 Nov 2005 19:34:29 -0000	1.29
--- rembedinternal.cpp	4 Nov 2005 13:30:58 -0000	1.30
***************
*** 96,100 ****
  
  void RFlushConsole () {
! 	REmbedInternal::this_pointer->flushOutput ();
  }
  
--- 96,104 ----
  
  void RFlushConsole () {
! /* nope, we're not going to do the line below after all. Two reasons:
! 1) We'd still have to add mutex protection around this call (ok, doable of course)
! 2) I don't think we need it at all: We do our own flushing, and R rarely flushes, for obscure reasons, anyway.
! In order to prevent R from doing silly things, we still override this function and leave it unimplemented on purpose. */
! //	REmbedInternal::this_pointer->flushOutput ();
  }
  
***************
*** 105,109 ****
  /*
  void RBusy (int which) {
! //TODO
  } */
  
--- 109,113 ----
  /*
  void RBusy (int which) {
! // I guess this is not any better (actually worse) than rkward's own busy indikator
  } */
  
***************
*** 138,144 ****
  	args.chars_b = headers;		// what exactly are the "headers"?!?
  	args.chars_c = &wtitle;
! 	args.chars_d = &pager;
  	args.int_b = del;
- 	// we ingnore the pager-parameter for now.
  
  	REmbedInternal::this_pointer->handleStandardCallback (&args);
--- 142,147 ----
  	args.chars_b = headers;		// what exactly are the "headers"?!?
  	args.chars_c = &wtitle;
! 	args.chars_d = &pager;		// we ingnore the pager-parameter for now.
  	args.int_b = del;
  
  	REmbedInternal::this_pointer->handleStandardCallback (&args);





More information about the rkward-tracker mailing list