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

Commit fec151ed authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++17 compatibility: `register` is no longer a keyword." am: f04392c7 am: 34056aea 

am: 95b16c47

Change-Id: I7989d3d9402c3e96a459f1bb72b5eefa0f320f02
parents 48072cfe 95b16c47

media/libstagefright/codecs/amrnb/common/src/l_abs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ Word32 L_abs (Word32 L_var1) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

----------------------------------------------------------------------------*/

Word32 L_abs(register Word32 L_var1)

Word32 L_abs(Word32 L_var1)

{

    /*----------------------------------------------------------------------------

    ; Define all local variables

media/libstagefright/codecs/amrnb/common/src/l_shr_r.cpp

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ Word32 L_shr_r (Word32 L_var1, Word16 var2) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

----------------------------------------------------------------------------*/

Word32 L_shr_r(register Word32 L_var1, register Word16 var2, Flag *pOverflow)

Word32 L_shr_r(Word32 L_var1, Word16 var2, Flag *pOverflow)

{

    Word32 result;

media/libstagefright/codecs/amrnb/common/src/negate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ Word16 negate (Word16 var1) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

----------------------------------------------------------------------------*/

Word16 negate(register Word16 var1)

Word16 negate(Word16 var1)

{

    /*----------------------------------------------------------------------------

    ; Define all local variables

media/libstagefright/codecs/amrnb/common/src/round.cpp

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ Word16 pv_round (Word32 L_var1) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

----------------------------------------------------------------------------*/

Word16 pv_round(register Word32 L_var1, Flag *pOverflow)

Word16 pv_round(Word32 L_var1, Flag *pOverflow)

{

    Word16  result;

media/libstagefright/codecs/amrnb/common/src/shr_r.cpp

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ Word16 shr_r (Word16 var1, Word16 var2) 
/*----------------------------------------------------------------------------

; FUNCTION CODE

----------------------------------------------------------------------------*/

Word16 shr_r(register Word16 var1, register Word16 var2, Flag *pOverflow)

Word16 shr_r(Word16 var1, Word16 var2, Flag *pOverflow)

{

    /*----------------------------------------------------------------------------

    ; Define all local variables