[simspark-cvs] simspark/spark/zeitgeist/scriptserver rubywrapper.cpp, 1.1, 1.1.2.1 rubywrapper.h, 1.1, 1.1.2.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32671

Modified Files:
      Tag: WIN32
	rubywrapper.cpp rubywrapper.h 
Log Message:
- rename recv to receiver in rbarguments (recv is a  windows macro)

Index: rubywrapper.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** rubywrapper.h	5 Dec 2005 21:05:01 -0000	1.1
--- rubywrapper.h	9 Feb 2007 16:17:22 -0000	1.1.2.1
***************
*** 53,57 ****
      /** RbArguments is a structure that describes a ruby function
          call.
!         \param recv is the ruby object that receives the function call
          \param id is the ruby id of the receiver member function
          \param n is the number of parameters passed
--- 53,57 ----
      /** RbArguments is a structure that describes a ruby function
          call.
!         \param receiver is the ruby object that receives the function call
          \param id is the ruby id of the receiver member function
          \param n is the number of parameters passed
***************
*** 61,71 ****
      struct RbArguments
      {
!         VALUE recv;
          ID id;
          int n;
          VALUE *argv;
  
!         RbArguments(VALUE recv, ID id, int n, VALUE *argv) :
!             recv(recv), id(id), n(n), argv(argv) {};
      };
  
--- 61,71 ----
      struct RbArguments
      {
!         VALUE receiver;
          ID id;
          int n;
          VALUE *argv;
  
!         RbArguments(VALUE r, ID id, int n, VALUE *argv) :
!             receiver(r), id(id), n(n), argv(argv) {};
      };
  

Index: rubywrapper.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/scriptserver/rubywrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** rubywrapper.cpp	5 Dec 2005 21:05:01 -0000	1.1
--- rubywrapper.cpp	9 Feb 2007 16:17:21 -0000	1.1.2.1
***************
*** 25,29 ****
  {
      RbArguments &a = *reinterpret_cast<RbArguments*>(arg);
!     return rb_funcall2(a.recv, a.id, a.n, a.argv);
  }
  
--- 25,29 ----
  {
      RbArguments &a = *reinterpret_cast<RbArguments*>(arg);
!     return rb_funcall2(a.receiver, a.id, a.n, a.argv);
  }
  
***************
*** 56,60 ****
  void zeitgeist::RbPrintError()
  {
!   std::cout << RbGetError() << std::endl;
    rb_backtrace();
  }
--- 56,60 ----
  void zeitgeist::RbPrintError()
  {
!   std::cout << RbGetError().c_str() << std::endl;
    rb_backtrace();
  }