X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=lib%2Fc%2B%2B%2Forb.cc;h=8533f52347146f677a142a539cca850b675819e3;hp=30b1bcc576c364893fe5a69ea4e5e93b1835b6db;hb=263f276afb0b78c5c8914a54975d383425869d66;hpb=b5cbe98949d5b279965d607c9618d404b26d4760

diff --git a/lib/c++/orb.cc b/lib/c++/orb.cc
index 30b1bcc..8533f52 100644
--- a/lib/c++/orb.cc
+++ b/lib/c++/orb.cc
@@ -7,8 +7,7 @@ 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)
+	uintptr_t downcast(::System::_i_Object *obj, const GUID *new_guid)
 	{
 		if (!obj)
 			return 0;
@@ -19,7 +18,7 @@ namespace RunTime {
 			unsupported_long_size();
 
 		IFaceTable *tbl = obj->info->concrete_IFaceTable;
-		unsigned long new_guid_first = *new_guid;
+		unsigned long new_guid_first = new_guid->l[0];
 		
 		// This doesn't use guids_equal(), as that would eliminate the
 		// ability to cache the first word of new_guid.  The compiler
@@ -29,15 +28,15 @@ namespace RunTime {
 		// behaves.
 		
 		while (true) {
-			if (tbl->guid[0] == new_guid_first &&
-			    tbl->guid[1] == new_guid[1] &&
+			if (tbl->info->guid->l[0] == new_guid_first &&
+			    tbl->info->guid->l[1] == new_guid->l[1] &&
 			    (sizeof(long) == 8 ||
-			     (tbl->guid[2] == new_guid[2] &&
-			      tbl->guid[3] == new_guid[3])))
+			     (tbl->info->guid->l[2] == new_guid->l[2] &&
+			      tbl->info->guid->l[3] == new_guid->l[3])))
 				break;				
 
 			tbl++;
-			if (__builtin_expect(!tbl->guid, 0))
+			if (__builtin_expect(!tbl->info->guid->l[0], 0))
 				return 0;
 		}
 	
@@ -58,7 +57,7 @@ namespace RunTime {
 		};
 
 		typedef ::Util::RadixTree<Object, ID, 6> ObjTable;
-		ObjTable objtable;
+//		ObjTable objtable;
 
 		unsigned long get_pc()
 		{
@@ -69,7 +68,7 @@ namespace RunTime {
 		{
 			// FIXME: marshall struct
 		}
-
+		
 		void handle_message(ParamInfoBlock *pib)
 		{
 			Message *msg = reinterpret_cast<Message *>(pib->segments[0].ptr);
@@ -81,8 +80,6 @@ namespace RunTime {
 						          sizeof(InvokeMethod));
 	
 //					ID obj = pib->objlist[0];
-					
-					
 					break;
 				}