commit fa0a4bde3fa520aa10de88239af04b45a3e28da0
author Andy McFadden <fadden@android.com> Mon Sep 21 14:33:20 2009 -0700
committer Andy McFadden <fadden@android.com> Mon Sep 21 14:33:20 2009 -0700
tree 266be60c60e453239bdb356c854e419e129b259b
parent 77fa24a5ef3ee3bc108d4bf3c77b7b4c7d0d5451

Work around gcc 4.0.3 bug.

This appears to fix the sim-eng build on the gDapper build machines.

Basic problem is that LayerBuffer::OverlaySource has a constructor that
calls SurfaceFlinger.signalEvent().  SurfaceFlinger lists LayerBuffer
as a friend, but that's not enough to convince gcc that the embedded
OverlaySource class is also a friend.  I don't see a way to make them
friendly, so I marked signalEvent() as public.

libs/surfaceflinger/SurfaceFlinger.h

diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h
index a34889a..493e777 100644
--- a/libs/surfaceflinger/SurfaceFlinger.h
+++ b/libs/surfaceflinger/SurfaceFlinger.h
@@ -250,7 +250,9 @@
           GraphicPlane&     graphicPlane(int dpy);
 
             void        waitForEvent();
+public:     // hack to work around gcc 4.0.3 bug
             void        signalEvent();
+private:
             void        signalDelayedEvent(nsecs_t delay);
 
             void        handleConsoleEvents();