eolian-cxx: Disabled temporarily the inheritance feature

This feature is buggy when using multi-level namespaces. I disabled it
temporarily and will fix it ASAP and re-enable it.

diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am
index f1f678a2b1bbb4916ef057af5f6c82614e672944..c5ad78a44b2c80750ee648f705fa965c759e1a8d 100644 (file)
--- a/src/examples/eolian_cxx/Makefile.am
+++ b/src/examples/eolian_cxx/Makefile.am
@@ -9,6 +9,7 @@ EOLIAN_FLAGS = \
   -I$(top_srcdir)/src/lib/eo \
   -I$(top_srcdir)/src/lib/evas/canvas \
   -I$(top_srcdir)/src/lib/edje \
+  -I$(top_srcdir)/src/lib/efl \
   -I$(top_srcdir)/src/lib/ecore_audio
 
 include $(top_srcdir)/src/Makefile_Eolian_Helper.am
@@ -79,7 +80,7 @@ SRCS = \
        $(IMPL)
 
 EXTRA_PROGRAMS = \
-       eolian_cxx_simple_01 \
+       eolian_cxx_simple_01 #\
        eolian_cxx_inherit_01
 
 DATA_FILES = Makefile.examples $(EOS)
@@ -91,12 +92,12 @@ eolian_cxx_simple_01_SOURCES = \
 
 eolian_cxx_simple_01.$(OBJEXT): $(GENERATED)
 
-eolian_cxx_inherit_01_SOURCES = \
-       eolian_cxx_inherit_01.cc \
-       colourable.c \
-       colourablesquare.c
+# eolian_cxx_inherit_01_SOURCES = \
+#      eolian_cxx_inherit_01.cc \
+#      colourable.c \
+#      colourablesquare.c
 
-eolian_cxx_inherit_01.$(OBJEXT): $(GENERATED)
+# eolian_cxx_inherit_01.$(OBJEXT): $(GENERATED)
 
 %.eo.hh: %.eo
        $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $<

diff --git a/src/lib/eolian_cxx/grammar/inheritance_base_generator.hh b/src/lib/eolian_cxx/grammar/inheritance_base_generator.hh
index fe89e6da0a2382c47de75d1188ab9feba32a3889..2bc9a0e75596f41edc96a93b2d1fa752e22428cc 100644 (file)
--- a/src/lib/eolian_cxx/grammar/inheritance_base_generator.hh
+++ b/src/lib/eolian_cxx/grammar/inheritance_base_generator.hh
@@ -384,12 +384,17 @@ operator<<(std::ostream& out, inheritance_eo_class_getter const& x)
 inline void
 eo_inheritance_detail_generator(std::ostream& out, eo_class const& cls)
 {
+#if 0 // Will be fixed ASAP
    out << inheritance_wrappers(cls)
+#endif
+   out
        << "namespace efl { namespace eo { namespace detail {" << endl << endl
+#if 0 // Will be fixed ASAP
        << inheritance_base_operations(cls) << endl
        << inheritance_base_operations_size(cls)
        << inheritance_operations_description(cls)
        << inheritance_call_constructors(cls)
+#endif
        << inheritance_extension(cls)
        << inheritance_eo_class_getter(cls)
        <<  "} } }" << endl;