X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=include%2Fc%2B%2B%2Forb.h;h=23f0b72571ad07e544855e6d7c26748c2ccb456e;hp=076f1ddea6e22aa4462ac40054ed6171bb08a7cb;hb=b5cbe98949d5b279965d607c9618d404b26d4760;hpb=d32da4b91b9a403ae9d65c48fbb25c1abbb5083f

diff --git a/include/c++/orb.h b/include/c++/orb.h
index 076f1dd..23f0b72 100644
--- a/include/c++/orb.h
+++ b/include/c++/orb.h
@@ -254,16 +254,12 @@ namespace System {
 			// Length of inheritance chain; 1 for System.VStruct
 			
 			const int chainlen;
-			
-			// Size of concrete vstruct
-			
-			const int structlen;
 		};
 		
 		uintptr_t downcast(::System::_i_Object *obj,
 		                   const unsigned long *new_guid);
 
-		typedef u64 GUID[2];
+		typedef uint64_t GUID[2];
 
 		// FIXME: use above typedef
 		static inline bool guids_equal(const unsigned long *guid1,
@@ -343,15 +339,6 @@ namespace System {
 				return false;
 #endif
 			}
-
-			typedef void (*MethodEntry)(ParamInfoBlock *pib);
-
-			struct Object {
-				MethodEntry entry;
-				void *ptr; // pointer to the class interface
-			};
-
-			typedef Util::RadixTree<Object, ID, 6> ObjTable;
 		}
 	};
 }
@@ -393,7 +380,7 @@ inline void operator delete[](void *ptr, ::System::RunTime::ORBMM *orbmm,
 	throw T(NULL, NULL, \
 	        new(::System::RunTime::orbmm) \
 	           ::System::Exceptions::NativeCodeExceptionOriginInfo \
-	           (::System::RunTime::get_pc()), \
+	           (::System::RunTime::Priv::get_pc()), \
 	        ::System::RunTime::Priv::in_kernel(), ##args); \
 } while (0)
 
@@ -401,7 +388,7 @@ inline void operator delete[](void *ptr, ::System::RunTime::ORBMM *orbmm,
 	throw T(new(::System::RunTime::orbmm) typeof(oldex)(oldex), NULL, \
 	        new(::System::RunTime::orbmm) \
 	           ::System::Exceptions::NativeCodeExceptionOriginInfo \
-	           (::System::RunTime::get_pc()), \
+	           (::System::RunTime::Priv::get_pc()), \
 	        ::System::RunTime::Priv::in_kernel(), ##args); \
 } while (0)
 #endif