jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=60e31101a66aa78b544f39cff6ba27cdc704deef

commit 60e31101a66aa78b544f39cff6ba27cdc704deef
Author: Jean-Philippe Andre <[email protected]>
Date:   Fri Oct 13 14:15:52 2017 +0900

    evas: Fix C++ compilation
    
    Efl.Animation and Efl.Canvas.Object need each other, and introduce a
    cyclic dependency. Eolian doesn't complain... but C++ fails to compile,
    as one header must be included before the other, and vice-versa.
    
    Do we have other cyclic dependencies? I remember we lifted the
    limitation in eolian itself, but can't remember exactly how it should be
    handled...
    
    Ping @q66 @felipealmeida
---
 src/lib/evas/canvas/efl_canvas_object.eo | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/canvas/efl_canvas_object.eo 
b/src/lib/evas/canvas/efl_canvas_object.eo
index a81ef1c5d9..ff8960fa46 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -661,7 +661,8 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
          [[Set the $animation which starts when the given $event_name happens 
to the object.]]
          params {
             @in event_type: Efl.Animation.Event_Type; [[The event type the 
given $animation is set for.]]
-            @in animation: Efl.Animation; [[The animation which starts when 
the given $event_name happens to the object.]]
+            @in animation: Efl.Object /* FIXME: Efl.Animation */;
+               [[The animation which starts when the given $event_name happens 
to the object.]]
          }
          legacy: null;
       }
@@ -671,7 +672,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
             @in event_type: Efl.Animation.Event_Type; [[The event type the 
given $animation is set for.]]
          }
          legacy: null;
-         return: Efl.Animation @warn_unused;
+         return: Efl.Object /* FIXME: Efl.Animation */ @warn_unused;
       }
    }
    implements {

-- 


Reply via email to