Merge branch 'origin'

Conflicts:

	lib/c++/orb.cc

diff --cc lib/c++/orb.cc
index 30b1bcc576c364893fe5a69ea4e5e93b1835b6db,31f5cf3cfba2a82d824c8ae55f32c8bf5e8ab7fc..a6158bf9ebcf0c23824e28e6adcf34f671b55e10
--- 1/lib/c++/orb.cc
--- 2/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;
                                }