Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c942150 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix struct vs. class mismatch in forward definitions" 

am: 8cdcd15c

Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca
parents abd9a76f 8cdcd15c

include/gui/ISurfaceComposer.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,8 @@ 
namespace android {

namespace android {

// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------





class ComposerState;

struct ComposerState;

class DisplayState;

struct DisplayState;

struct DisplayInfo;

struct DisplayInfo;

struct DisplayStatInfo;

struct DisplayStatInfo;

class HdrCapabilities;

class HdrCapabilities;

include/gui/SurfaceComposerClient.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ namespace android { 




// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------





class DisplayInfo;

struct DisplayInfo;

class Composer;

class Composer;

class HdrCapabilities;

class HdrCapabilities;

class ISurfaceComposerClient;

class ISurfaceComposerClient;

include/ui/Gralloc1On0Adapter.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ private: 




    // Buffer descriptor lifecycle functions

    // Buffer descriptor lifecycle functions





    class Descriptor;

    struct Descriptor;





    gralloc1_error_t createDescriptor(

    gralloc1_error_t createDescriptor(

            gralloc1_buffer_descriptor_t* outDescriptor);

            gralloc1_buffer_descriptor_t* outDescriptor);