diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-10 01:43:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 01:43:11 +0000 |
| commit | 5746f1497814e105352214f1bba242317856605a (patch) | |
| tree | bcecfddf19629ef9d084af75994d6ce1454dc791 | |
| parent | f7a8f90ad4845752f5eb57ecc62a2bfd86313667 (diff) | |
| parent | fb017a4c3b23741f737093c3fcb78087bbe5e73c (diff) | |
| download | frameworks_native-5746f1497814e105352214f1bba242317856605a.zip frameworks_native-5746f1497814e105352214f1bba242317856605a.tar.gz frameworks_native-5746f1497814e105352214f1bba242317856605a.tar.bz2 | |
am fb017a4c: Merge "Fix clang warnings about struct vs. class."
* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
Fix clang warnings about struct vs. class.
| -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 742fc83..430a409 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 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 @@ 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; |