diff options
| author | Andy McFadden <fadden@android.com> | 2009-10-29 14:44:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:44:00 -0700 |
| commit | a2e9e893267498938a16eccdc1a7836d47581295 (patch) | |
| tree | 04ed234dcb4e56bb2b784039689de0ab24d8a242 | |
| parent | b7b45ed4aa0863f5412660af1777a41a660796ed (diff) | |
| parent | cad9a4b0468eb9611cc9b7d7b380d8af3fff8588 (diff) | |
| download | frameworks_base-a2e9e893267498938a16eccdc1a7836d47581295.zip frameworks_base-a2e9e893267498938a16eccdc1a7836d47581295.tar.gz frameworks_base-a2e9e893267498938a16eccdc1a7836d47581295.tar.bz2 | |
am cad9a4b0: am 66e06205: Another gcc 4.0.3 workaround.
Merge commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588'
* commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588':
Another gcc 4.0.3 workaround.
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h index 6698e00..f9bfe6c 100644 --- a/libs/surfaceflinger/SurfaceFlinger.h +++ b/libs/surfaceflinger/SurfaceFlinger.h @@ -246,8 +246,10 @@ private: virtual status_t readyToRun(); virtual void onFirstRef(); +public: // hack to work around gcc 4.0.3 bug const GraphicPlane& graphicPlane(int dpy) const; GraphicPlane& graphicPlane(int dpy); +private: void waitForEvent(); public: // hack to work around gcc 4.0.3 bug |