Merge branch 'origin'

[polintos/scott/priv.git] / lib / c++ / orb.cc

diff --git a/lib/c++/orb.cc b/lib/c++/orb.cc
index 31f5cf3cfba2a82d824c8ae55f32c8bf5e8ab7fc..a6158bf9ebcf0c23824e28e6adcf34f671b55e10 100644 (file)
--- a/lib/c++/orb.cc
+++ b/lib/c++/orb.cc
@@ -7,7 +7,6 @@ namespace RunTime {
 
        // This function could be made to do a binary search if we can
        // manage to somehow sort the IFaceTables...
-
        uintptr_t downcast(::System::_i_Object *obj,
                           const unsigned long *new_guid)
        {
@@ -49,7 +48,6 @@ namespace RunTime {
                
                return ptr;
        };
-       
 
        namespace Priv {
                typedef void (*MethodEntry)(ParamInfoBlock *pib);
@@ -59,7 +57,7 @@ namespace RunTime {
                        void *ptr; // pointer to the class interface
                };
 
-               typedef Util::RadixTree<Object, ID, 6> ObjTable;
+               typedef ::Util::RadixTree<Object, ID, 6> ObjTable;
                ObjTable objtable;
 
                unsigned long get_pc()
@@ -69,9 +67,7 @@ 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)
@@ -84,9 +80,7 @@ namespace RunTime {
                                                throw_idl(ShortMessage, 0, pib->segments[0].len,
                                                          sizeof(InvokeMethod));
        
-               //                      ID obj = pib->objlist[0];
-                                       
-                                       
+//                                     ID obj = pib->objlist[0];
                                        break;
                                }
                                
@@ -106,8 +100,8 @@ extern "C" void handle_message(::System::RunTime::ParamInfoBlock *pib,
                ::System::RunTime::Priv::handle_message(pib);
        }
        
-       catch (::System::Exceptions::Exception *ex) {
-               ::System::RunTime::Priv::exception_to_array(ex, ex_arr);
+       catch (::System::Exceptions::Exception &ex) {
+               ::System::RunTime::Priv::exception_to_array(&ex, ex_arr);
        }
        
        catch (...) {