| commit | 646f54105018e99ef4a30ee41f01f7d1ab66c38e | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Thu Aug 07 22:19:07 2014 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Thu Sep 04 10:07:28 2014 -0700 |
| tree | 67ddfa8460705b5d666c38b6260d2f5dc3b134a1 | |
| parent | 46a1f6b40e1f7677cd41cd30f729ff66c7c21517 [diff] |
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
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 9f1937b..d0031fb 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h
@@ -38,7 +38,7 @@ class ComposerState; class DisplayState; -class DisplayInfo; +struct DisplayInfo; class IDisplayEventConnection; class IMemoryHeap; class Rect;
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 @@ 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 @@ * This behaves more or less like a forward iterator. */ class LayerListIterator { - friend struct HWComposer; + friend class HWComposer; HWCLayer* const mLayerList; size_t mIndex;