am fb017a4c: Merge "Fix clang warnings about struct vs. class."

* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
  Fix clang warnings about struct vs. class.
This commit is contained in:
Dan Albert 2014-09-10 01:43:11 +00:00 committed by Android Git Automerger
commit 5746f14978
3 changed files with 3 additions and 3 deletions

View File

@ -38,7 +38,7 @@ namespace android {
class ComposerState; class ComposerState;
class DisplayState; class DisplayState;
class DisplayInfo; struct DisplayInfo;
class IDisplayEventConnection; class IDisplayEventConnection;
class IMemoryHeap; class IMemoryHeap;
class Rect; class Rect;

View File

@ -37,7 +37,7 @@ struct ANativeWindow;
namespace android { namespace android {
class DisplayInfo; struct DisplayInfo;
class DisplaySurface; class DisplaySurface;
class IGraphicBufferProducer; class IGraphicBufferProducer;
class Layer; class Layer;

View File

@ -196,7 +196,7 @@ public:
* This behaves more or less like a forward iterator. * This behaves more or less like a forward iterator.
*/ */
class LayerListIterator { class LayerListIterator {
friend struct HWComposer; friend class HWComposer;
HWCLayer* const mLayerList; HWCLayer* const mLayerList;
size_t mIndex; size_t mIndex;