Add IFaceInfo.

[polintos/scott/priv.git] / include / c++ / orb.h

diff --git a/include/c++/orb.h b/include/c++/orb.h
index 30c4157728e083e885d37188f1fa56ed88f5425e..72daad843dcedaaed5ab6175e8e174d9c55ad62d 100644 (file)
--- a/include/c++/orb.h
+++ b/include/c++/orb.h
@@ -327,10 +327,12 @@ namespace System {
                        const int chainlen;
                };
                
-               uintptr_t downcast(::System::_i_Object *obj,
-                                  const unsigned long *new_guid);
+               union GUID {
+                       unsigned char c[16];
+                       unsigned long l[];
+               };
 
-               typedef uint64_t GUID[2];
+               uintptr_t downcast(::System::_i_Object *obj, const GUID *new_guid);
 
                // FIXME: use above typedef
                static inline bool guids_equal(const unsigned long *guid1,
@@ -395,7 +397,7 @@ namespace System {
                };
 
                struct IFaceInfo {
-                       static const uint8_t *guid;
+                       const GUID *guid;
                        int (*marshall)(GrowableArray<uint8_t> &buf,
                                        GrowableArray<ID> &objlist,
                                        ParamInfoBlock::Segment *segs,