Fix IS_INSTANCE macro to match what moopp generates.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 02450cd6adba6e949a87ceef58563d0e24f2d5a5..06ff47d655e6bef5bc80fdcbfc50936ee443efd7 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-26  Bruno Haible  <bruno@clisp.org>
+
+       * lib/moo.h (IS_INSTANCE): Fix reference to vtable.
+
 2006-11-26  Bruno Haible  <bruno@clisp.org>
 
        * build-aux/moopp: In the C++ class definition, add 'operator ==',

diff --git a/gnulib-local/lib/moo.h b/gnulib-local/lib/moo.h
index e5f3736ec0da7eb2ebec9789407040bea3fdfe11..75e2adad6e261384d7e392a3d06ea90be2e9e028 100644 (file)
--- a/gnulib-local/lib/moo.h
+++ b/gnulib-local/lib/moo.h
@@ -229,10 +229,10 @@ typedef struct
    the file that implements CLASSNAME but is better optimized.  */
 #define IS_INSTANCE(obj,rootclassname,classname) \
   (((const struct rootclassname##_representation_header *)(const struct any_##rootclassname##_representation *)(obj))->vtable->superclasses_length \
-   >= classname##_implementation.superclasses_length \
+   >= classname##_vtable.superclasses_length \
    && ((const struct rootclassname##_representation_header *)(const struct any_##rootclassname##_representation *)(obj))->vtable->superclasses \
       [((const struct rootclassname##_representation_header *)(const struct any_##rootclassname##_representation *)(obj))->vtable->superclasses_length \
-       - classname##_implementation.superclasses_length] \
+       - classname##_vtable.superclasses_length] \
       == & classname##_typeinfo)
 #define IS_INSTANCE_PRIVATE(obj,rootclassname,classname) \
   (((const struct rootclassname##_representation_header *)(const struct any_##rootclassname##_representation *)(obj))->vtable->superclasses_length \