| commit | fb017a4c3b23741f737093c3fcb78087bbe5e73c | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Sep 10 00:40:03 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 10 00:40:04 2014 +0000 |
| tree | 756165d4843e85df092a3855dc081337073ba5bd | |
| parent | 11c13abd56693d4a4be3ca9e14cbaa456ba586b9 [diff] | |
| parent | aeb8ab8c34343bd64a4b2247615ea3da97fa02f6 [diff] |
Merge "Fix clang warnings about struct vs. class."
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 5c3c99c..ffc44c7 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h
@@ -35,7 +35,7 @@ class ComposerState; class DisplayState; -class DisplayInfo; +struct DisplayInfo; class IDisplayEventConnection; class IMemoryHeap;
diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index 01a9d2e..46292a4 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 9f96113..30df461 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.h +++ b/services/surfaceflinger/DisplayHardware/HWComposer.h
@@ -191,7 +191,7 @@ * This behaves more or less like a forward iterator. */ class LayerListIterator { - friend struct HWComposer; + friend class HWComposer; HWCLayer* const mLayerList; size_t mIndex;