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

Commit 8cdcd15c authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

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

parents c4dd0c3b a2362b44

include/gui/ISurfaceComposer.h

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

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



class ComposerState;

class DisplayState;

struct ComposerState;

struct DisplayState;

struct DisplayInfo;

struct DisplayStatInfo;

class HdrCapabilities;

include/gui/SurfaceComposerClient.h

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


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



class DisplayInfo;

struct DisplayInfo;

class Composer;

class HdrCapabilities;

class ISurfaceComposerClient;

include/ui/Gralloc1On0Adapter.h

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


    // Buffer descriptor lifecycle functions



    class Descriptor;

    struct Descriptor;



    gralloc1_error_t createDescriptor(

            gralloc1_buffer_descriptor_t* outDescriptor);