From: Scott Wood <scott@buserror.net>
Date: Wed, 4 Jul 2007 01:33:58 +0000 (-0500)
Subject: Merge branch 'origin'
X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=commitdiff_plain;h=15d9baeca05f30f8564785c255fed765ede457ff

Merge branch 'origin'

Conflicts:

	lib/c++/orb.cc
---

15d9baeca05f30f8564785c255fed765ede457ff
diff --cc lib/c++/orb.cc
index 30b1bcc,31f5cf3..a6158bf
--- a/lib/c++/orb.cc
+++ b/lib/c++/orb.cc
@@@ -67,9 -69,11 +67,9 @@@ namespace RunTime 
  
  		void exception_to_array(::System::VStruct *ex, Array<uint8_t> *ar)
  		{
 -			// FIXME
 -//			ar->ptr = reinterpret_cast<uint8_t *>(ex);
 -//			ar->count = ex->_infoptr->structlen;
 +			// FIXME: marshall struct
  		}
- 
+ 		
  		void handle_message(ParamInfoBlock *pib)
  		{
  			Message *msg = reinterpret_cast<Message *>(pib->segments[0].ptr);
@@@ -80,9 -84,9 +80,7 @@@
  						throw_idl(ShortMessage, 0, pib->segments[0].len,
  						          sizeof(InvokeMethod));
  	
 -		//			ID obj = pib->objlist[0];
 -					
 -					
 +//					ID obj = pib->objlist[0];
- 					
- 					
  					break;
  				}