diff options
| author | Andy McFadden <fadden@android.com> | 2009-10-29 13:20:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 13:20:46 -0700 |
| commit | cad9a4b0468eb9611cc9b7d7b380d8af3fff8588 (patch) | |
| tree | 698bc3d89946146931fa8465b1ee86863bd4bba5 | |
| parent | 1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b (diff) | |
| parent | 66e06205030cfc72f9aeeac57acfd6cbff0c1b8a (diff) | |
| download | frameworks_base-cad9a4b0468eb9611cc9b7d7b380d8af3fff8588.zip frameworks_base-cad9a4b0468eb9611cc9b7d7b380d8af3fff8588.tar.gz frameworks_base-cad9a4b0468eb9611cc9b7d7b380d8af3fff8588.tar.bz2 | |
am 66e06205: Another gcc 4.0.3 workaround.
Merge commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a' into eclair-mr2-plus-aosp
* commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a':
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 |