diff options
| author | Jesse Hall <jessehall@google.com> | 2014-08-07 22:19:07 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2014-10-31 09:51:10 -0700 |
| commit | 1495ceb88594bf3c5963ef65ee12953dc0354546 (patch) | |
| tree | cb2130e7f019ce69f5306f9f964afe0e549a52b7 | |
| parent | 1834f8ea975e9a882b44dc479320fe02e306e630 (diff) | |
| download | frameworks_native-1495ceb88594bf3c5963ef65ee12953dc0354546.zip frameworks_native-1495ceb88594bf3c5963ef65ee12953dc0354546.tar.gz frameworks_native-1495ceb88594bf3c5963ef65ee12953dc0354546.tar.bz2 | |
surfaceflinger: fix -Wmismatched-tags warnings
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]
warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]
Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit 646f54105018e99ef4a30ee41f01f7d1ab66c38e)
| -rw-r--r-- | include/gui/ISurfaceComposer.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 3ffc67e..51717a4 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -38,7 +38,7 @@ namespace android { class ComposerState; class DisplayState; -class DisplayInfo; +struct DisplayInfo; class DisplayStatInfo; class IDisplayEventConnection; class IMemoryHeap; diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index d3f784a..8695a44 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -37,7 +37,7 @@ struct ANativeWindow; namespace android { -class DisplayInfo; +struct DisplayInfo; class DisplaySurface; class IGraphicBufferProducer; class Layer; diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.h b/services/surfaceflinger/DisplayHardware/HWComposer.h index 5cb56a0..a62ac5c 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.h +++ b/services/surfaceflinger/DisplayHardware/HWComposer.h @@ -196,7 +196,7 @@ public: * This behaves more or less like a forward iterator. */ class LayerListIterator { - friend struct HWComposer; + friend class HWComposer; HWCLayer* const mLayerList; size_t mIndex; |