Merge branch 'origin'

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

diff --git a/lib/c++/orb.cc b/lib/c++/orb.cc
index 30b1bcc576c364893fe5a69ea4e5e93b1835b6db..a6158bf9ebcf0c23824e28e6adcf34f671b55e10 100644 (file)
--- a/lib/c++/orb.cc
+++ b/lib/c++/orb.cc
@@ -29,15 +29,15 @@ namespace RunTime {
                // behaves.
                
                while (true) {
-                       if (tbl->guid[0] == new_guid_first &&
-                           tbl->guid[1] == new_guid[1] &&
+                       if (tbl->info->guid[0] == new_guid_first &&
+                           tbl->info->guid[1] == new_guid[1] &&
                            (sizeof(long) == 8 ||
-                            (tbl->guid[2] == new_guid[2] &&
-                             tbl->guid[3] == new_guid[3])))
+                            (tbl->info->guid[2] == new_guid[2] &&
+                             tbl->info->guid[3] == new_guid[3])))
                                break;                          
 
                        tbl++;
-                       if (__builtin_expect(!tbl->guid, 0))
+                       if (__builtin_expect(!tbl->info->guid, 0))
                                return 0;
                }
        
@@ -69,7 +69,7 @@ namespace RunTime {
                {
                        // FIXME: marshall struct
                }
-
+               
                void handle_message(ParamInfoBlock *pib)
                {
                        Message *msg = reinterpret_cast<Message *>(pib->segments[0].ptr);
@@ -81,8 +81,6 @@ namespace RunTime {
                                                          sizeof(InvokeMethod));
        
 //                                     ID obj = pib->objlist[0];
-                                       
-                                       
                                        break;
                                }